Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+2
-2
@@ -431,10 +431,10 @@ void FlmTests::tryModifyFileContent()
|
||||
|
||||
data.id = flc.id;
|
||||
data.name = flc.name;
|
||||
if (flc.exerciseId.is_set())
|
||||
if (flc.exerciseId.has_value())
|
||||
{
|
||||
data.exerciseId = flc.exerciseId.get();
|
||||
if (flc.phaseId.is_set())
|
||||
if (flc.phaseId.has_value())
|
||||
data.phaseId = flc.phaseId.get();
|
||||
}
|
||||
data.fileCategory = flc.fileCategory;
|
||||
|
||||
@@ -177,9 +177,9 @@ int DtcImplCustom::getFileId(const FileType &fileType, const QString &fileName,
|
||||
{
|
||||
const FileContent &content = fc.data();
|
||||
bool cond = (content.fileType == fileType && content.name == strFileName);
|
||||
if (content.exerciseId.is_set())
|
||||
if (content.exerciseId.has_value())
|
||||
cond &= (content.exerciseId == exerciseId);
|
||||
if (content.phaseId.is_set())
|
||||
if (content.phaseId.has_value())
|
||||
cond &= (content.phaseId == phaseId);
|
||||
|
||||
if (cond)
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
#pragma once
|
||||
|
||||
// Registers the Qt metatype for the FileManagement::Folder DDS type when it is used
|
||||
// as a QVariant value in GUI code.
|
||||
//
|
||||
// Declared in a single, guarded location so the QMetaTypeId<T> specialization is
|
||||
// defined before any Q_OBJECT slot/signal QtMocHelpers::SlotData instantiates the
|
||||
// primary QMetaTypeId<T> template. Qt6 rejects a class-template specialization that
|
||||
// follows the primary template's implicit instantiation ("specialization of
|
||||
// QMetaTypeId<T> after instantiation"), which Qt5 tolerated, so the declaration must
|
||||
// precede the first such SlotData in a translation unit.
|
||||
#include <FileManagement/flm_dtc.h>
|
||||
#include <QMetaType>
|
||||
|
||||
#ifndef Q_DECLARE_METATYPE_FileManagement_Folder
|
||||
#define Q_DECLARE_METATYPE_FileManagement_Folder
|
||||
Q_DECLARE_METATYPE(FileManagement::Folder)
|
||||
#endif
|
||||
@@ -232,10 +232,10 @@ Database::FlmFileContent ObjectFileContent::toDbData(const FileContent &ddsData)
|
||||
dbData.folderId = ddsData.folderId;
|
||||
dbData.fileTypeId = ddsData.fileType;
|
||||
dbData.operatorId = ddsData.operatorId;
|
||||
if (ddsData.exerciseId.is_set())
|
||||
if (ddsData.exerciseId.has_value())
|
||||
{
|
||||
dbData.exerciseId = ddsData.exerciseId.get();
|
||||
if (ddsData.phaseId.is_set())
|
||||
if (ddsData.phaseId.has_value())
|
||||
dbData.phaseId = ddsData.phaseId.get();
|
||||
}
|
||||
dbData.fileStatusId = ddsData.fileStatus;
|
||||
|
||||
Reference in new issue
Block a user