diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-09-02 13:19:53 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-09-02 13:19:53 (GMT) |
| commit | 4e0ec071d3d4ac6142ac7542f98b6dd9c827e6de (patch) | |
| tree | 1b1326d4fcc0732430f0d8dba11208c26b9151a0 /tools | |
| parent | aae54d0dd60ca7ac5c2b013cb2f1e5365cd9855e (diff) | |
| parent | cac60dcca5b4632173a8fe76a78cd2ec9bea5873 (diff) | |
| download | Qt-4e0ec071d3d4ac6142ac7542f98b6dd9c827e6de.zip Qt-4e0ec071d3d4ac6142ac7542f98b6dd9c827e6de.tar.gz Qt-4e0ec071d3d4ac6142ac7542f98b6dd9c827e6de.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8'
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 \ |