diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-12-17 14:54:42 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-12-17 14:54:42 (GMT) |
| commit | 17977f5067ab75541029d7278776ea8ff999ee77 (patch) | |
| tree | e8bbf14f2d3cea6cd0bbd36162de21f4ec987cd8 /tools/designer | |
| parent | e2ed04bac3cd353711bfd50eba3232692b40ab99 (diff) | |
| download | Qt-17977f5067ab75541029d7278776ea8ff999ee77.zip Qt-17977f5067ab75541029d7278776ea8ff999ee77.tar.gz Qt-17977f5067ab75541029d7278776ea8ff999ee77.tar.bz2 | |
Designer: Fix compilation with -static on Mac OS X
Avoid linking the solutions used by Designer twice (in the two
Designer libraries). Just use the include paths in case of
static linking.
Reviewed-by: Carlos Duclos <carlos.duclos@nokia.com>
Task-number: QTBUG-6863
Diffstat (limited to 'tools/designer')
| -rw-r--r-- | tools/designer/src/components/objectinspector/objectinspector.pri | 8 | ||||
| -rw-r--r-- | tools/designer/src/components/propertyeditor/propertyeditor.pri | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/tools/designer/src/components/objectinspector/objectinspector.pri b/tools/designer/src/components/objectinspector/objectinspector.pri index 280a1dc..733c4b3 100644 --- a/tools/designer/src/components/objectinspector/objectinspector.pri +++ b/tools/designer/src/components/objectinspector/objectinspector.pri @@ -1,4 +1,10 @@ -include($$QT_SOURCE_TREE/tools/shared/findwidget/findwidget.pri) +# --- The Find widget is also linked into the designer_shared library. +# Avoid conflict when linking statically +contains(CONFIG, static) { + INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/findwidget +} else { + include($$QT_SOURCE_TREE/tools/shared/findwidget/findwidget.pri) +} INCLUDEPATH += $$PWD diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.pri b/tools/designer/src/components/propertyeditor/propertyeditor.pri index d3e44a5..a8ed37e 100644 --- a/tools/designer/src/components/propertyeditor/propertyeditor.pri +++ b/tools/designer/src/components/propertyeditor/propertyeditor.pri @@ -4,8 +4,15 @@ INCLUDEPATH += $$PWD -include($$QT_SOURCE_TREE/tools/shared/qtpropertybrowser/qtpropertybrowser.pri) -include($$QT_SOURCE_TREE/tools/shared/qtgradienteditor/qtcolorbutton.pri) +# --- 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($$QT_SOURCE_TREE/tools/shared/qtpropertybrowser/qtpropertybrowser.pri) + include($$QT_SOURCE_TREE/tools/shared/qtgradienteditor/qtcolorbutton.pri) +} FORMS += $$PWD/paletteeditor.ui \ $$PWD/stringlisteditor.ui \ |