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

simplify mkspec determination when writing qconfig.cpp

Browse Source 
we don't actually support qualified specs anyway - all tests assume
that they can use startsWith() on the spec name.

Change-Id: I9dc8688858d4798c3a18c34757318dcd7fd47c57
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-12-03 10:13:41 +01:00
parent 4b557751e8
commit 68fae07d80
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/configure/configureapp.cpp
View File

@ -3867,11 +3867,6 @@ void Configure::generateHeaders()
} }
} }
static QString stripPrefix(const QString &str, const QString &pfx)
{
return str.startsWith(pfx) ? str.mid(pfx.length()) : str;
}
void Configure::substPrefix(QString *path) void Configure::substPrefix(QString *path)
{ {
QString spfx = dictionary["QT_SYSROOT_PREFIX"]; QString spfx = dictionary["QT_SYSROOT_PREFIX"];
@ -3881,6 +3876,9 @@ void Configure::substPrefix(QString *path)
void Configure::generateQConfigCpp() void Configure::generateQConfigCpp()
{ {
QString hostSpec = dictionary["QMAKESPEC"];
QString targSpec = dictionary.contains("XQMAKESPEC") ? dictionary["XQMAKESPEC"] : hostSpec;
// if QT_INSTALL_* have not been specified on commandline, define them now from QT_INSTALL_PREFIX // if QT_INSTALL_* have not been specified on commandline, define them now from QT_INSTALL_PREFIX
// if prefix is empty (WINCE), make all of them empty, if they aren't set // if prefix is empty (WINCE), make all of them empty, if they aren't set
bool qipempty = false; bool qipempty = false;
@ -3963,10 +3961,6 @@ void Configure::generateQConfigCpp()
if (dictionary["QT_HOST_DATA"].isEmpty()) if (dictionary["QT_HOST_DATA"].isEmpty())
dictionary["QT_HOST_DATA"] = haveHpx ? dictionary["QT_HOST_PREFIX"] : dictionary["QT_INSTALL_ARCHDATA"]; dictionary["QT_HOST_DATA"] = haveHpx ? dictionary["QT_HOST_PREFIX"] : dictionary["QT_INSTALL_ARCHDATA"];
QString specPfx = dictionary["QT_HOST_DATA"] + "/mkspecs/";
QString hostSpec = stripPrefix(dictionary["QMAKESPEC"], specPfx);
QString targSpec = dictionary.contains("XQMAKESPEC") ? stripPrefix(dictionary["XQMAKESPEC"], specPfx) : hostSpec;
// Generate the new qconfig.cpp file // Generate the new qconfig.cpp file
{ {
FileWriter tmpStream(buildPath + "/src/corelib/global/qconfig.cpp"); FileWriter tmpStream(buildPath + "/src/corelib/global/qconfig.cpp");