diff options
| author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-09-02 13:51:35 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-09-14 09:34:10 +0000 |
| commit | b1738d63298ef1850995d13e9f7c8bcc6156edc1 (patch) | |
| tree | 6b2d567f07b78bbcf4b5cf32c1b09c2153ab2628 /tools | |
| parent | 65efeb6f9d0e447df4e0b5b2e4d64954ddd2fdfa (diff) | |
WinRT: Display error message when configuring with -no-opengl
-no-opengl is not a supported option when compiling for WinRT or Windows
Phone. Hence bail out early to avoid compilation errors at later stage.
Task-number: QTBUG-48041
Change-Id: I449b8935b95f0b75139a0f7bfa13256ea3fe95e5
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index ab4e091d6b..99cc69eb5f 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2677,6 +2677,14 @@ bool Configure::verifyConfiguration() } } + if (dictionary["OPENGL"] == "no" || dictionary["OPENGL_ES_2"] == "no") { + if (dictionary.value("XQMAKESPEC").startsWith("winphone") || + dictionary.value("XQMAKESPEC").startsWith("winrt")) { + cout << "ERROR: Option -no-opengl is not valid for WinRT." << endl; + dictionary[ "DONE" ] = "error"; + } + } + if (prompt) promptKeyPress(); |