diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-16 10:23:25 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-16 12:21:06 +0100 |
| commit | 0f8eec1d99f84e506632ea33d98446b726a37aed (patch) | |
| tree | b470e3647dce843f525a6ebe8b7aedeeaaed809c | |
| parent | 266b9fa04c65a00b45c7dc56fa205ff1388375d5 (diff) | |
CMake: Fix static build of designer
The QT_DESIGNER_STATIC define was not set due to erroneous conditions.
Pick-to: 6.0
Fixes: QTBUG-89515
Change-Id: Ib3292bbc6a97346a9368598f98f9e865400d300d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/designer/src/components/lib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/designer/src/designer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/CMakeLists.txt | 5 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt index 26ae82d81..10ef8327b 100644 --- a/src/designer/src/components/lib/CMakeLists.txt +++ b/src/designer/src/components/lib/CMakeLists.txt @@ -878,12 +878,9 @@ qt_internal_add_resource(DesignerComponents "widgetbox" ## Scopes: ##################################################################### -qt_internal_extend_target(DesignerComponents CONDITION static +qt_internal_extend_target(DesignerComponents CONDITION NOT QT_BUILD_SHARED_LIBS DEFINES QT_DESIGNER_STATIC -) - -qt_internal_extend_target(DesignerComponents CONDITION NOT QT_BUILD_SHARED_LIBS INCLUDE_DIRECTORIES ../../../../shared/findwidget ../../../../shared/qtgradienteditor diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt index 5de06465d..aef11e1e9 100644 --- a/src/designer/src/designer/CMakeLists.txt +++ b/src/designer/src/designer/CMakeLists.txt @@ -105,7 +105,7 @@ qt_internal_extend_target(designer CONDITION TARGET Qt::PrintSupport Qt::PrintSupport ) -qt_internal_extend_target(designer CONDITION QT_CONFIG___contains___static +qt_internal_extend_target(designer CONDITION NOT QT_BUILD_SHARED_LIBS DEFINES QT_DESIGNER_STATIC ) diff --git a/src/designer/src/lib/CMakeLists.txt b/src/designer/src/lib/CMakeLists.txt index 20335e0dd..99d88a2e9 100644 --- a/src/designer/src/lib/CMakeLists.txt +++ b/src/designer/src/lib/CMakeLists.txt @@ -453,12 +453,9 @@ qt_internal_extend_target(Designer CONDITION TARGET Qt::OpenGLWidgets Qt::OpenGLWidgets ) -qt_internal_extend_target(Designer CONDITION static +qt_internal_extend_target(Designer CONDITION NOT QT_BUILD_SHARED_LIBS DEFINES QT_DESIGNER_STATIC -) - -qt_internal_extend_target(Designer CONDITION NOT QT_BUILD_SHARED_LIBS SOURCES ../../../shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp ../../../shared/qtpropertybrowser/qtbuttonpropertybrowser.h ../../../shared/qtpropertybrowser/qteditorfactory.cpp ../../../shared/qtpropertybrowser/qteditorfactory.h |