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

normalize $$QMAKE_QMAKE

Browse Source 
everything in the projects should be normalized. only the makefile
generators need to adjust it to the native form.

Change-Id: I06a4e997f32134d13949ec4a9dd1b44367aab7cb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-23 12:44:40 +02:00
parent 2cfde5d9c3
commit 3c144b54cf
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkspecs/win32-g++/qmake.conf
View File

@ -83,7 +83,6 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
!isEmpty(QMAKE_SH) {
MINGW_IN_SHELL = 1
QMAKE_DIR_SEP = /
QMAKE_QMAKE ~= s,\\\\,/,
QMAKE_COPY = cp
QMAKE_STREAM_EDITOR = sed
QMAKE_COPY_DIR = cp -r

4
qmake/generators/makefile.cpp
View File

@ -856,8 +856,8 @@ MakefileGenerator::init()
}
// escape qmake command
QStringList &qmk = project->values("QMAKE_QMAKE");
qmk = escapeFilePaths(qmk);
project->values("QMAKE_QMAKE") =
escapeFilePaths(QStringList(Option::fixPathToTargetOS(Option::qmake_abslocation, false)));
}
bool

5
qmake/project.cpp
View File

@ -3861,12 +3861,11 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis
}
} else if (var == QLatin1String("QMAKE_QMAKE")) {
if (place[var].isEmpty())
place[var] = QStringList(Option::fixPathToTargetOS(
place[var] = QStringList(
!Option::qmake_abslocation.isEmpty()
? Option::qmake_abslocation
: QLibraryInfo::rawLocation(QLibraryInfo::HostBinariesPath,
QLibraryInfo::EffectivePaths) + "/qmake",
false));
QLibraryInfo::EffectivePaths) + "/qmake");
}
#if defined(Q_OS_WIN32) && defined(Q_CC_MSVC)
else if(var.startsWith(QLatin1String("QMAKE_TARGET."))) {