1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: don't read QMAKESPEC from the environment

Browse Source 
it was rather unexpected that this was done, entirely inconsistently
with how the rest of the configure parameters are handled.

Task-number: QTBUG-52266
Change-Id: I6e1d7a4fe1c85d6d64d465517b6be3f3cdda3359
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-11-17 19:24:49 +01:00
parent 6d2f7e9efe
commit 798b09ffe6
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -479,7 +479,7 @@ XPLATFORM_TVOS=no # Whether target platform is tvOS
XPLATFORM_WATCHOS=no # Whether target platform is watchOS XPLATFORM_WATCHOS=no # Whether target platform is watchOS
XPLATFORM_ANDROID=no XPLATFORM_ANDROID=no
XPLATFORM_MINGW=no # Whether target platform is MinGW (win32-g++*) XPLATFORM_MINGW=no # Whether target platform is MinGW (win32-g++*)
PLATFORM=$QMAKESPEC PLATFORM=
OPT_CONFIRM_LICENSE=no OPT_CONFIRM_LICENSE=no
OPT_SHADOW=maybe OPT_SHADOW=maybe
OPT_VERBOSE=no OPT_VERBOSE=no

8
tools/configure/configureapp.cpp
View File

@ -107,12 +107,9 @@ Configure::Configure(int& argc, char** argv)
dictionary[ "QT_INSTALL_PREFIX" ] = installPath; dictionary[ "QT_INSTALL_PREFIX" ] = installPath;
dictionary[ "QMAKESPEC" ] = getenv("QMAKESPEC");
if (dictionary[ "QMAKESPEC" ].size() == 0) { if (dictionary[ "QMAKESPEC" ].size() == 0) {
dictionary[ "QMAKESPEC" ] = Environment::detectQMakeSpec(); dictionary[ "QMAKESPEC" ] = Environment::detectQMakeSpec();
dictionary[ "QMAKESPEC_FROM" ] = "detected"; dictionary[ "QMAKESPEC_FROM" ] = "detected";
} else {
dictionary[ "QMAKESPEC_FROM" ] = "env";
} }
dictionary[ "SYNCQT" ] = "auto"; dictionary[ "SYNCQT" ] = "auto";
@ -481,12 +478,9 @@ void Configure::parseCmdLine()
dictionary[ "DONE" ] = "error"; dictionary[ "DONE" ] = "error";
if (dictionary ["QMAKESPEC_FROM"] == "commandline") { if (dictionary ["QMAKESPEC_FROM"] == "commandline") {
cout << "Invalid option \"" << dictionary["QMAKESPEC"] << "\" for -platform." << endl; cout << "Invalid option \"" << dictionary["QMAKESPEC"] << "\" for -platform." << endl;
} else if (dictionary ["QMAKESPEC_FROM"] == "env") {
cout << "QMAKESPEC environment variable is set to \"" << dictionary["QMAKESPEC"]
<< "\" which is not a supported platform" << endl;
} else { // was autodetected from environment } else { // was autodetected from environment
cout << "Unable to detect the platform from environment. Use -platform command line" << endl cout << "Unable to detect the platform from environment. Use -platform command line" << endl
<< "argument or set the QMAKESPEC environment variable and run configure again." << endl; << "argument and run configure again." << endl;
} }
cout << "See the README file for a list of supported operating systems and compilers." << endl; cout << "See the README file for a list of supported operating systems and compilers." << endl;
} else { } else {