diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 21:13:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 21:13:57 (GMT) |
| commit | cac60dcca5b4632173a8fe76a78cd2ec9bea5873 (patch) | |
| tree | 68578e8dcdfa1c3ad44e60e57c1af9ded1c10ed6 /tools | |
| parent | f14bbde351d90bed520f9503500f922f7aa18c92 (diff) | |
| parent | 3b9e83706c6770dada7c3b66b68e81b53a3d16d6 (diff) | |
| download | Qt-cac60dcca5b4632173a8fe76a78cd2ec9bea5873.zip Qt-cac60dcca5b4632173a8fe76a78cd2ec9bea5873.tar.gz Qt-cac60dcca5b4632173a8fe76a78cd2ec9bea5873.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:
Designer: Fix static linking.
Diffstat (limited to 'tools')
| -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 \ |