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

Use Utils::FileName for various bits in QtVersion

Browse Source 
Change-Id: I3afc3a4f2e0dd2671279c2d071779f1d7b277849
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2011-11-25 13:19:58 +01:00
parent c6936d9e80
commit f5d4287123
75 changed files with 356 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -559,7 +559,7 @@ void Qt4Project::updateCppCodeModel()
if (rootQt4ProjectNode())
allIncludePaths.append(rootQt4ProjectNode()->resolvedMkspecPath());
else if (activeBC->qtVersion())
allIncludePaths.append(activeBC->qtVersion()->mkspecPath());
allIncludePaths.append(activeBC->qtVersion()->mkspecPath().toString());
allIncludePaths.append(predefinedIncludePaths);
@@ -966,7 +966,7 @@ QtSupport::ProFileReader *Qt4Project::createProFileReader(Qt4ProFileNode *qt4Pro
QStringList args;
if (QMakeStep *qs = bc->qmakeStep()) {
args = qs->parserArguments();
m_proFileOption->qmakespec = qs->mkspec();
m_proFileOption->qmakespec = qs->mkspec().toString();
} else {
args = bc->configCommandLineArguments();
}