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

This variable is only used on mac, so move it into the #ifdef block

Browse Source
This commit is contained in:
dt
2009-10-09 18:25:41 +02:00
parent 98b4a16cd0
commit 20767b79a4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -577,7 +577,6 @@ void Qt4Project::updateCodeModel()
const QHash<QString, QString> versionInfo = qtVersion(activeBuildConfiguration())->versionInfo(); const QHash<QString, QString> versionInfo = qtVersion(activeBuildConfiguration())->versionInfo();
const QString newQtIncludePath = versionInfo.value(QLatin1String("QT_INSTALL_HEADERS")); const QString newQtIncludePath = versionInfo.value(QLatin1String("QT_INSTALL_HEADERS"));
const QString newQtLibsPath = versionInfo.value(QLatin1String("QT_INSTALL_LIBS"));
predefinedIncludePaths.append(newQtIncludePath); predefinedIncludePaths.append(newQtIncludePath);
QDir dir(newQtIncludePath); QDir dir(newQtIncludePath);
@@ -597,6 +596,7 @@ void Qt4Project::updateCodeModel()
QStringList allFrameworkPaths = predefinedFrameworkPaths; QStringList allFrameworkPaths = predefinedFrameworkPaths;
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
const QString newQtLibsPath = versionInfo.value(QLatin1String("QT_INSTALL_LIBS"));
allFrameworkPaths.append(newQtLibsPath); allFrameworkPaths.append(newQtLibsPath);
// put QtXXX.framework/Headers directories in include path since that qmake's behavior // put QtXXX.framework/Headers directories in include path since that qmake's behavior
QDir frameworkDir(newQtLibsPath); QDir frameworkDir(newQtLibsPath);