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

More fixes for windows

Browse Source
This commit is contained in:
dt
2009-11-10 18:57:40 +01:00
parent 1a6f279314
commit aa9329e738
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1019,6 +1019,10 @@ QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString
baseMkspecDir = version->versionInfo().value("QT_INSTALL_DATA") + "/mkspecs";
QString parsedSpec = QDir::cleanPath(list.at(index));
#ifdef Q_OS_WIN
baseMkspecDir = baseMkspecDir.toLower();
parsedSpec = parsedSpec.toLower();
#endif
// if the path is relative it can be
// relative to the working directory (as found in the Makefiles)
// or relatively to the mkspec directory
@@ -1027,6 +1031,9 @@ QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString
if (QFileInfo(parsedSpec).isRelative()) {
if(QFileInfo(directory + "/" + parsedSpec).exists()) {
parsedSpec = QDir::cleanPath(directory + "/" + parsedSpec);
#ifdef Q_OS_WIN
parsedSpec = parsedSpec.toLower();
#endif
} else {
parsedSpec = baseMkspecDir + "/" + parsedSpec;
}
@@ -1043,7 +1050,7 @@ QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString
} else {
QString sourceMkSpecPath = version->sourcePath() + "/mkspecs";
if (parsedSpec.startsWith(sourceMkSpecPath)) {
parsedSpec = sourceMkSpecPath.mid(sourceMkSpecPath.length() + 1);
parsedSpec = parsedSpec.mid(sourceMkSpecPath.length() + 1);
}
}
#ifdef Q_OS_WIN
@@ -1309,7 +1316,9 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(BuildConfiguration *confi
if (actualSpec == parsedSpec)
return true;
// Actual spec is the default one
if (actualSpec == version->mkspec() && (parsedSpec == "default" || parsedSpec.isEmpty()))
qDebug()<<"AS vs VS"<<actualSpec<<version->mkspec();
if ((actualSpec == version->mkspec() || actualSpec == "default")
&& (parsedSpec == version->mkspec() || parsedSpec == "default" || parsedSpec.isEmpty()))
return true;
}
}

6
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -1069,6 +1069,10 @@ void QtVersion::updateToolChainAndMkspec() const
if (baseMkspecDir.isEmpty())
baseMkspecDir = versionInfo().value("QT_INSTALL_DATA") + "/mkspecs";
#ifdef Q_OS_WIN
baseMkspecDir = baseMkspecDir.toLower();
#endif
QString mkspecFullPath = baseMkspecDir + "/default";
// qDebug() << "default mkspec is located at" << mkspecFullPath;
@@ -1123,7 +1127,7 @@ void QtVersion::updateToolChainAndMkspec() const
#endif
#ifdef Q_OS_WIN
m_mkspecFullPath = m_mkspecFullPath.toLower();
mkspecFullPath = mkspecFullPath.toLower();
#endif
m_mkspecFullPath = mkspecFullPath;