AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the -version-override command line arguments in configure.exe

Browse Source 
Those are not supported on Unix configure and are not something
we should support IMO.

Also cleaned up setting a QMAKE_QT_VERSION_OVERRIDE variable
in qconfig.pri that's never used.

Change-Id: I470483660118368abf7bd8aba4a53a25d9ab8a40
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-07-02 08:37:10 +02:00
parent 24f770ba24
commit 89152c57d8
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/configure/configureapp.cpp
View File

@ -928,13 +928,6 @@ void Configure::parseCmdLine()
zlibLibs = QDir::fromNativeSeparators(configCmdLine.at(i));
}
else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){
++i;
if (i == argCount)
break;
dictionary[ "VERSION" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-saveconfig") {
++i;
if (i == argCount)
@ -2666,14 +2659,6 @@ void Configure::generateOutputVars()
if (dictionary["MSVC_MP"] == "yes")
qmakeConfig += "msvc_mp";
if (dictionary[ "SHARED" ] == "yes") {
QString version = dictionary[ "VERSION" ];
if (!version.isEmpty()) {
qmakeVars += "QMAKE_QT_VERSION_OVERRIDE = " + version.left(version.indexOf('.'));
version.remove(QLatin1Char('.'));
}
}
if (dictionary["ATOMIC64"] == "libatomic")
qmakeConfig += "atomic64-libatomic";