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

Fixes: Build on msvc

Browse Source 
RevBy:    Found by me.
This commit is contained in:
Joerg Bornemann
2008-12-05 12:55:31 +01:00
parent a87297bf66
commit 58827feb20
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -963,7 +963,7 @@ void QtVersion::updateVersionInfo() const
QString line = stream.readLine(); QString line = stream.readLine();
int index = line.indexOf(":"); int index = line.indexOf(":");
if (index != -1) if (index != -1)
m_versionInfo.insert(line.left(index), line.mid(index+1)); m_versionInfo.insert(line.left(index), QDir::fromNativeSeparators(line.mid(index+1)));
} }
} }
@@ -1035,6 +1035,7 @@ void QtVersion::updateMkSpec() const
mkspec = mkspec.mid(QString("$$QT_BUILD_TREE/mkspecs/").length()); mkspec = mkspec.mid(QString("$$QT_BUILD_TREE/mkspecs/").length());
else if (mkspec.startsWith("$$QT_BUILD_TREE\\mkspecs\\")) else if (mkspec.startsWith("$$QT_BUILD_TREE\\mkspecs\\"))
mkspec = mkspec.mid(QString("$$QT_BUILD_TREE\\mkspecs\\").length()); mkspec = mkspec.mid(QString("$$QT_BUILD_TREE\\mkspecs\\").length());
mkspec = QDir::fromNativeSeparators(mkspec);
} }
break; break;
} }
@@ -1097,10 +1098,11 @@ void QtVersion::updateMkSpec() const
#endif #endif
} }
int index =mkspec.lastIndexOf('/'); int index = mkspec.lastIndexOf('/');
if(index == -1) if(index == -1)
index = mkspec.lastIndexOf('\\'); index = mkspec.lastIndexOf('\\');
if (index >= 0 && QDir(mkspec.left(index)).canonicalPath() == QDir(m_path + "/mkspecs/").canonicalPath()) QString mkspecDir = QDir(m_path + "/mkspecs/").canonicalPath();
if (index >= 0 && QDir(mkspec.left(index)).canonicalPath() == mkspecDir)
mkspec = mkspec.mid(index+1).trimmed(); mkspec = mkspec.mid(index+1).trimmed();
m_mkspec = mkspec; m_mkspec = mkspec;
@@ -1112,7 +1114,7 @@ QString QtVersion::makeCommand() const
{ {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
const QString &spec = mkspec(); const QString &spec = mkspec();
if (spec.startsWith("win32-msvc") || spec == QLatin1String("win32-icc")) if (spec.contains("win32-msvc") || spec.contains(QLatin1String("win32-icc")))
return "nmake.exe"; return "nmake.exe";
else if(spec.startsWith("wince")) else if(spec.startsWith("wince"))
return "nmake.exe"; return "nmake.exe";
@@ -1149,7 +1151,7 @@ QtVersion::ToolchainType QtVersion::toolchainType() const
if (!isValid()) if (!isValid())
return INVALID; return INVALID;
const QString &spec = mkspec(); const QString &spec = mkspec();
if(spec.startsWith("win32-msvc") || spec == QLatin1String("win32-icc")) if(spec.contains("win32-msvc") || spec.contains(QLatin1String("win32-icc")))
return MSVC; return MSVC;
else if(spec == "win32-g++") else if(spec == "win32-g++")
return MinGW; return MinGW;