From c1bea0b532e45adfc6d4b6c699355c7f645cd65b Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Mon, 10 Feb 2014 10:01:58 +0100
Subject: Configure: Disable widgets module too if gui module is disabled

Use the same logic as in the Unix configure script, and disable
"widgets" if "gui" is disabled.

Change-Id: Ica338ad10b965eea297dddaaedeea61a3ae3ebe9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 tools/configure/configureapp.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'tools/configure')

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index c6d1002f23..350ce63087 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2536,12 +2536,14 @@ void Configure::generateOutputVars()
     else
         qtConfig += "shared";
 
+    if (dictionary[ "GUI" ] == "no") {
+        qtConfig += "no-gui";
+        dictionary [ "WIDGETS" ] = "no";
+    }
+
     if (dictionary[ "WIDGETS" ] == "no")
         qtConfig += "no-widgets";
 
-    if (dictionary[ "GUI" ] == "no")
-        qtConfig += "no-gui";
-
     // Compression --------------------------------------------------
     if (dictionary[ "ZLIB" ] == "qt")
         qtConfig += "zlib";
-- 
cgit v1.2.3