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

CMake: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: I23134b7eef222dcdb3425e2f2f6d62ab863009fe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-21 23:54:06 +02:00
committed by Daniel Teske
parent b5bfb81508
commit 862629c57a
13 changed files with 109 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -133,7 +133,7 @@ ProjectExplorer::Project *CMakeManager::openProject(const QString &fileName, QSt
QString CMakeManager::mimeType() const
{
return Constants::CMAKEMIMETYPE;
return QLatin1String(Constants::CMAKEMIMETYPE);
}
QString CMakeManager::cmakeExecutable() const
@@ -224,7 +224,7 @@ QString CMakeManager::qtVersionForQMake(const QString &qmakePath)
qWarning("Timeout running '%s'.", qPrintable(qmakePath));
return QString();
}
QString output = qmake.readAllStandardOutput();
QString output = QString::fromLocal8Bit(qmake.readAllStandardOutput());
QRegExp regexp(QLatin1String("(QMake version|Qmake version:)[\\s]*([\\d.]*)"));
regexp.indexIn(output);
if (regexp.cap(2).startsWith(QLatin1String("2."))) {