diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2011-08-31 14:11:47 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2011-08-31 14:22:05 (GMT) |
| commit | 3b9e83706c6770dada7c3b66b68e81b53a3d16d6 (patch) | |
| tree | 9a0e06efdf32c79744ba3ae8f10d4cc1da519639 /tools/designer/src/components | |
| parent | a36c81774cb6ac45c211c85f6f2e797688b4946b (diff) | |
| download | Qt-3b9e83706c6770dada7c3b66b68e81b53a3d16d6.zip Qt-3b9e83706c6770dada7c3b66b68e81b53a3d16d6.tar.gz Qt-3b9e83706c6770dada7c3b66b68e81b53a3d16d6.tar.bz2 | |
Designer: Fix static linking.
Fix a regression introduced by change
e7762b60d519c9ae4b47f6c4ceece584408247ea working
around an issue caused by changing the behaviour of qFindChild<> in
99160bb9f851bf02fe5345b5f52217b6c77a57c4.
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
Task-number: QTBUG-21173
Diffstat (limited to 'tools/designer/src/components')
| -rw-r--r-- | tools/designer/src/components/propertyeditor/propertyeditor.pri | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.pri b/tools/designer/src/components/propertyeditor/propertyeditor.pri index bb1afdb..60219e1 100644 --- a/tools/designer/src/components/propertyeditor/propertyeditor.pri +++ b/tools/designer/src/components/propertyeditor/propertyeditor.pri @@ -4,15 +4,8 @@ INCLUDEPATH += $$PWD -# --- Property browser is also linked into the designer_shared library. -# Avoid conflict when linking statically -contains(CONFIG, static) { - 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) -} +include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri) +include(../../../../shared/qtgradienteditor/qtcolorbutton.pri) FORMS += $$PWD/paletteeditor.ui \ $$PWD/stringlisteditor.ui \ |