From d394225d89a48c7bc537f3566960272b1da8471c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 5 Nov 2012 19:02:04 +0100
Subject: [PATCH] unbreak default spec resolution under macx
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>
---
src/plugins/qtsupport/baseqtversion.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 82aa6987a76..1e346e6f5e8 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1292,7 +1292,8 @@ Utils::FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<QString, QStrin
}
f2.close();
}
-#elif defined(Q_OS_MAC)
+#else
+# ifdef Q_OS_MAC
QFile f2(mkspecFullPath.toString() + QLatin1String("/qmake.conf"));
if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
while (!f2.atEnd()) {
@@ -1306,15 +1307,14 @@ Utils::FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<QString, QStrin
// qDebug() << "default mkspec is xcode, falling back to g++";
mkspecFullPath = baseMkspecDir.appendPath(QLatin1String("macx-g++"));
}
- //resolve mkspec link
- mkspecFullPath = Utils::FileName::fromString(mkspecFullPath.toFileInfo().canonicalFilePath());
}
break;
}
}
f2.close();
}
-#else
+# endif
+ //resolve mkspec link
mkspecFullPath = Utils::FileName::fromString(mkspecFullPath.toFileInfo().canonicalFilePath());
#endif
--
GitLab