Make compile with -no-widgets

Change-Id: I8b725e8f600268ad3d2105eb2015bcf778adf48d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/examples/examples.pro b/examples/examples.pro
index 3c12ee6..c81388c 100644 (file)
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS +=  help designer uitools
+!isEmpty(QT.widgets.name): SUBDIRS += help designer uitools
+

diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
index 52690f0..e0deece 100644 (file)
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -3,7 +3,7 @@ SUBDIRS  = \
     lrelease \
     lupdate \
     lconvert
-!no-png:!contains(QT_CONFIG, no-gui):SUBDIRS += linguist
+!no-png:!isEmpty(QT.widgets.name): SUBDIRS += linguist
 
 win32:CMAKE_BIN_SUFFIX = ".exe"
 

diff --git a/src/qdbus/qdbus.pro b/src/qdbus/qdbus.pro
index abb1b2d..aeb1c96 100644 (file)
--- a/src/qdbus/qdbus.pro
+++ b/src/qdbus/qdbus.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = qdbus
-!contains(QT_CONFIG, no-gui): SUBDIRS += qdbusviewer
+!isEmpty(QT.widgets.name): SUBDIRS += qdbusviewer

diff --git a/src/src.pro b/src/src.pro
index 96249d9..c21cf2e 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
-!contains(QT_CONFIG, no-gui) {
+!isEmpty(QT.widgets.name) {
     no-png {
         message("Some graphics-related tools are unavailable without PNG support")
     } else {