feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

unbreak default spec resolution under macx

Browse Source 
when the spec is not xcode-based, we need to treat it as a regular unix,
i.e., resolve the symlink.

Change-Id: I155f4337dc0007261fc316876c4d6999e10f8ea6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Oswald Buddenhagen
2012-11-05 19:02:04 +01:00
parent 7d4e3b7b4c
commit d394225d89
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1292,7 +1292,8 @@ Utils::FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<QString, QStrin
} }
f2.close(); f2.close();
} }
#elif defined(Q_OS_MAC) #else
# ifdef Q_OS_MAC
QFile f2(mkspecFullPath.toString() + QLatin1String("/qmake.conf")); QFile f2(mkspecFullPath.toString() + QLatin1String("/qmake.conf"));
if (f2.exists() && f2.open(QIODevice::ReadOnly)) { if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
while (!f2.atEnd()) { while (!f2.atEnd()) {
@@ -1306,15 +1307,14 @@ Utils::FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<QString, QStrin
// qDebug() << "default mkspec is xcode, falling back to g++"; // qDebug() << "default mkspec is xcode, falling back to g++";
mkspecFullPath = baseMkspecDir.appendPath(QLatin1String("macx-g++")); mkspecFullPath = baseMkspecDir.appendPath(QLatin1String("macx-g++"));
} }
//resolve mkspec link
mkspecFullPath = Utils::FileName::fromString(mkspecFullPath.toFileInfo().canonicalFilePath());
} }
break; break;
} }
} }
f2.close(); f2.close();
} }
#else # endif
//resolve mkspec link
mkspecFullPath = Utils::FileName::fromString(mkspecFullPath.toFileInfo().canonicalFilePath()); mkspecFullPath = Utils::FileName::fromString(mkspecFullPath.toFileInfo().canonicalFilePath());
#endif #endif