diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-07-21 22:55:48 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-07-24 09:10:30 +0200 |
| commit | d0223dabe6922669519a0f7ed0704a13ce99951e (patch) | |
| tree | b53d79bc63a2179f1eb049d3e5a3e112c4fa14cd | |
| parent | b8eb6d147ae5d2bb1dedadd9aa2aec42d7599afc (diff) | |
QtDesigner: unbreak unity-build-batch-size 100000
Exclude TUs that cause problems in a build where all of QtDesigner's
.cpp files end up in a single unity_0_cxx.cxx. This should ensure that
the build will forthwith not fail because someone added a new .cpp
file in the "wrong" position.
Of course, this is just a snapshot, with my configuration: Clang 15,
Ubuntu 20.04, -developer-build, C++23, -sctp, libc++ (which means I
can't link most of the tools, because of problems similar to
QTBUG-115032).
Task-number: QTBUG-115448
Pick-to: 6.6 6.5
Change-Id: I2363194bc2c9e07d75d58be7386dba9fb0778a2e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/designer/src/components/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/CMakeLists.txt | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt index 635653374..e911e59aa 100644 --- a/src/designer/src/components/lib/CMakeLists.txt +++ b/src/designer/src/components/lib/CMakeLists.txt @@ -94,6 +94,8 @@ qt_internal_add_module(DesignerComponentsPrivate ../widgetbox/widgetboxcategorylistview.cpp ../widgetbox/widgetboxcategorylistview.h ../widgetbox/widgetboxtreewidget.cpp ../widgetbox/widgetboxtreewidget.h qdesigner_components.cpp + NO_UNITY_BUILD_SOURCES + ../tabordereditor/tabordereditor.cpp # redefinition of 'QMetaTypeId<QList<QWidget *>>' (from qdesigner_resource.cpp) DEFINES QDESIGNER_COMPONENTS_LIBRARY QT_NO_CONTEXTLESS_CONNECT diff --git a/src/designer/src/lib/CMakeLists.txt b/src/designer/src/lib/CMakeLists.txt index 7e4c109c9..d6788f7c1 100644 --- a/src/designer/src/lib/CMakeLists.txt +++ b/src/designer/src/lib/CMakeLists.txt @@ -149,6 +149,19 @@ qt_internal_add_module(Designer uilib/ui4.cpp uilib/ui4_p.h components/qdesigner_components.h components/qdesigner_components_global.h + NO_UNITY_BUILD_SOURCES + shared/previewconfigurationwidget.cpp # no type named 'PreviewConfigurationWidget' in namespace 'qdesigner_internal::Ui' + shared/qdesigner_command.cpp # redefinition of 'QMetaTypeId<QList<QWidget *>>' (from morphmenu.cpp) + # and recursiveUpdate (from formwindowbase.cpp) + shared/qlayout_widget.cpp # redefinition of 'FormLayoutColumns' (from layout.cpp) + shared/qtresourceeditordialog.cpp # redefinition of 'Geometry' (from plaintexteditor.cpp) + shared/richtexteditor.cpp # no type named 'AddLinkDialog' in namespace 'qdesigner_internal::Ui' + shared/selectsignaldialog.cpp # no type named 'SelectSignalDialog' in namespace 'qdesigner_internal::Ui' + shared/signalslotdialog.cpp # no type named 'SignalSlotDialogClass' in namespace 'qdesigner_internal::Ui' + shared/widgetdatabase.cpp # redefinition of 'debugWidgetDataBase' (from abstractwidgetdatabase.cpp) + uilib/abstractformbuilder.cpp # redefinition of 'QMetaTypeId<QList<QWidget *>>' (from morphmenu.cpp) + uilib/formbuilderextra.cpp # use of undeclared identifier 'dcw' + uilib/properties.cpp # 'setupColorGroup' [etc] is a protected member of 'QAbstractFormBuilder' DEFINES QDESIGNER_EXTENSION_LIBRARY QDESIGNER_SDK_LIBRARY |