From 367ea0c9675ddfe6536aa2026f00d8cbcad835b3 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Mon, 11 Mar 2013 16:49:06 +0100
Subject: [PATCH] QtSupport: Fix check for installed qt for framework builds of
qt 4.8
Task-number: QTCREATORBUG-8839
Change-Id: If41eecca6e20c2766a63b576e2329b4c9fd5e5e7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/qtsupport/baseqtversion.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 343afd5d294..bf0101cdcaa 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -952,10 +952,14 @@ void BaseQtVersion::updateVersionInfo() const
if (!fi.exists())
m_installed = false;
}
- if (!qtHeaderData.isNull()) {
- const QFileInfo fi(qtHeaderData);
- if (!fi.exists())
- m_installed = false;
+ // Framework builds for Qt 4.8 don't use QT_INSTALL_HEADERS
+ // so we don't check on mac
+ if (!HostOsInfo::isMacHost()) {
+ if (!qtHeaderData.isNull()) {
+ const QFileInfo fi(qtHeaderData);
+ if (!fi.exists())
+ m_installed = false;
+ }
}
const QString qtInstallDocs = qmakeProperty("QT_INSTALL_DOCS");
if (!qtInstallDocs.isNull()) {
--
GitLab