diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-08 16:38:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-08 16:38:09 (GMT) |
| commit | 6c24cde00e3a046e6face6f08ec2ed996b54a8f1 (patch) | |
| tree | 98cc254be6eea0477a829d4eda9aadd6ffcc9ec4 | |
| parent | c96788a1bfca0701311e867a6e6b09c87593f917 (diff) | |
| parent | 74884dd3821b22453804cd726e8d10908f493adf (diff) | |
| download | Qt-6c24cde00e3a046e6face6f08ec2ed996b54a8f1.zip Qt-6c24cde00e3a046e6face6f08ec2ed996b54a8f1.tar.gz Qt-6c24cde00e3a046e6face6f08ec2ed996b54a8f1.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Qt Designer: Fix static linking on Mac.
| -rw-r--r-- | tools/designer/src/components/propertyeditor/propertyeditor.pri | 9 | ||||
| -rw-r--r-- | tools/designer/src/lib/shared/shared.pri | 12 |
2 files changed, 18 insertions, 3 deletions
diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.pri b/tools/designer/src/components/propertyeditor/propertyeditor.pri index 60219e1..e5e4d46 100644 --- a/tools/designer/src/components/propertyeditor/propertyeditor.pri +++ b/tools/designer/src/components/propertyeditor/propertyeditor.pri @@ -4,8 +4,13 @@ INCLUDEPATH += $$PWD -include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri) -include(../../../../shared/qtgradienteditor/qtcolorbutton.pri) +contains(CONFIG, static) { # see shared.pri + INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/qtpropertybrowser + INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/qtgradienteditor +} else { + include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri) + include(../../../../shared/qtgradienteditor/qtcolorbutton.pri) +} FORMS += $$PWD/paletteeditor.ui \ $$PWD/stringlisteditor.ui \ diff --git a/tools/designer/src/lib/shared/shared.pri b/tools/designer/src/lib/shared/shared.pri index 9d50911..b07f565 100644 --- a/tools/designer/src/lib/shared/shared.pri +++ b/tools/designer/src/lib/shared/shared.pri @@ -2,7 +2,17 @@ INCLUDEPATH += $$PWD contains(QT_CONFIG, script): QT += script -include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri) +# When linking dynamically, use only the QKeySequenceEdit widget of +# the property browser solution as the other symbols of the property +# browser solution must not be duplicated (see e7762b60d51). When linking +# statically, add the property browser solution to make the library self-contained +# and use only the include path in the property editor (see propertyeditor.pri) + +contains(CONFIG, static) { + include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri) +} else { + include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri) +} include(../../../../shared/deviceskin/deviceskin.pri) include(../../../../../src/tools/rcc/rcc.pri) include(../../../../shared/findwidget/findwidget.pri) |