diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-23 12:44:40 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:46:07 +0200 |
| commit | 3c144b54cfe93463cf4e8ce9ca3b9d550f5d72bc (patch) | |
| tree | 08eddb5984531afb6a8bb2d97e758399c7a8696f /qmake/project.cpp | |
| parent | 2cfde5d9c37ffdaa808f2342bd454c57c67da885 (diff) | |
normalize $$QMAKE_QMAKE
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>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index fb4d439bef..3a34aef1a9 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -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."))) { |