diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-26 15:04:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-26 17:38:16 +0100 |
| commit | fb3f94b22bbe3cb52c5d936d04b2e721e98d2e97 (patch) | |
| tree | c7a8faf56a6a258eaf209fee1fa3026cf31a3c69 | |
| parent | b9d0c62882781e073e8c934b02516d87ae07ba25 (diff) | |
Fix static build of Qt Designer on Windows.
Ensure QT_DESIGNER_STATIC is defined everywhere such that
the EXPORT macros evaluate to empty.
Task-number: QTBUG-28131
Change-Id: I111b1351c4d81172adc9110d31b8b7ed13af7ef5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/designer/src/components/lib/lib.pro | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/designer.pro | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/lib.pro | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro index fa6caf004..69104514b 100644 --- a/src/designer/src/components/lib/lib.pro +++ b/src/designer/src/components/lib/lib.pro @@ -10,6 +10,8 @@ load(qt_module) DEFINES += QT_STATICPLUGIN DEFINES += QDESIGNER_COMPONENTS_LIBRARY +static:DEFINES += QT_DESIGNER_STATIC + load(qt_targets) QMAKE_TARGET_PRODUCT = Designer QMAKE_TARGET_DESCRIPTION = Graphical user interface designer. diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index b3478c5de..744db3140 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -11,7 +11,7 @@ INCLUDEPATH += \ RESOURCES += designer.qrc -contains(CONFIG, static) { +contains(QT_CONFIG, static) { DEFINES += QT_DESIGNER_STATIC } diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index 33331f04b..a2be6b98f 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -12,6 +12,8 @@ DEFINES += \ QDESIGNER_UILIB_LIBRARY \ QDESIGNER_SHARED_LIBRARY +static:DEFINES += QT_DESIGNER_STATIC + #mac frameworks mac:CONFIG += explicitlib mac:!static:contains(QT_CONFIG, qt_framework) { |