diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-17 15:33:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-17 15:33:48 (GMT) |
| commit | 21eb38ccf07953f62e2b0a1d3440e9d9bb5cfc86 (patch) | |
| tree | c72ac4a2ed04b13eadea48af4049f61617e30132 /tools | |
| parent | b8a4b365b1105a742369bbaa5dc00e43914089e0 (diff) | |
| parent | 17977f5067ab75541029d7278776ea8ff999ee77 (diff) | |
| download | Qt-21eb38ccf07953f62e2b0a1d3440e9d9bb5cfc86.zip Qt-21eb38ccf07953f62e2b0a1d3440e9d9bb5cfc86.tar.gz Qt-21eb38ccf07953f62e2b0a1d3440e9d9bb5cfc86.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fix compilation with -static on Mac OS X
Configure support for multiple include levels in qmake.conf hierarchy.
Stop the configuration if the test compiler cannot be found.
Diffstat (limited to 'tools')
| -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 \ |