diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-09-01 23:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-09-01 23:00:13 (GMT) |
| commit | 2e923e93d4993263cb889db6eb1d81c8cd213f75 (patch) | |
| tree | 73c8cca1966f28896d6c9d1c1e64b6aaae65dd4c | |
| parent | eee351a2af7e34dfc851a95820075842f856a8f2 (diff) | |
| parent | cac60dcca5b4632173a8fe76a78cd2ec9bea5873 (diff) | |
| download | Qt-2e923e93d4993263cb889db6eb1d81c8cd213f75.zip Qt-2e923e93d4993263cb889db6eb1d81c8cd213f75.tar.gz Qt-2e923e93d4993263cb889db6eb1d81c8cd213f75.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
| -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 \ |