diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-02-10 10:01:58 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 20:59:15 +0100 |
| commit | c1bea0b532e45adfc6d4b6c699355c7f645cd65b (patch) | |
| tree | 3b9b89e0a49d10151bf139014e1679e7e697b561 /tools | |
| parent | a2bfd114938e1fdd5067f2dac812a8d3a5d89fd3 (diff) | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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"; |