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>
This commit is contained in:
Maurice Kalinowski 2015-09-02 13:51:35 +02:00
parent 65efeb6f9d
commit b1738d6329

View File

@ -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();