diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-05-25 12:31:23 -0500 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-26 13:32:08 +0200 |
| commit | 56f030b9947485b87399432d2bb9b8dcf9d562de (patch) | |
| tree | 9938a1f3b0c2a6ec14478bb694bad3dec722fa47 | |
| parent | 8c9deffcb38eb0a75b876c37613d02eb14c2c0f6 (diff) | |
Add QtTools' include/QtDesigner as well as QtCore's include/QtDesigner
In modularization QT+=uilib adds the QtCore specific include/QtDesigner,
while QT += designer adds the QtTools specific one.
Using !isEmpty(QT.<module/library>.name) is the proper way to check for
module/library existance in modularized Qt.
Change-Id: If1fe5d192129fd1cdbf43183b52327d7fa9c57ec
Reviewed-on: http://codereview.qt.nokia.com/126
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | mkspecs/features/designer.prf | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mkspecs/features/designer.prf b/mkspecs/features/designer.prf index 63a7e76a34..843a118a9a 100644 --- a/mkspecs/features/designer.prf +++ b/mkspecs/features/designer.prf @@ -1,7 +1,6 @@ -QT += xml -contains(QT_CONFIG, script): QT += script +QT += xml uilib +!isEmpty(QT.script.name): QT += script +!isEmpty(QT.designer.name): QT += designer qt:load(qt) plugin:DEFINES += QDESIGNER_EXPORT_WIDGETS - -qtAddLibrary(QtDesigner, true) |