diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-08 12:55:21 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-08 13:49:38 (GMT) |
| commit | 74884dd3821b22453804cd726e8d10908f493adf (patch) | |
| tree | 7f12eabb2b18256e1a3052fa98e01ea07f2de6fd /tools/designer | |
| parent | e0383c9b8bd6f4e3d445d69690f84209cad42bb5 (diff) | |
| download | Qt-74884dd3821b22453804cd726e8d10908f493adf.zip Qt-74884dd3821b22453804cd726e8d10908f493adf.tar.gz Qt-74884dd3821b22453804cd726e8d10908f493adf.tar.bz2 | |
Qt Designer: Fix static linking on Mac.
Add a comment in shared.pri explaining the problem.
See also e7762b60d519c9ae4b47f6c4ceece584408247ea
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-22542
Diffstat (limited to 'tools/designer')
| -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) |