From 56f030b9947485b87399432d2bb9b8dcf9d562de Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Wed, 25 May 2011 12:31:23 -0500
Subject: [PATCH] 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>
---
 mkspecs/features/designer.prf | 7 +++----
 1 file 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)