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

Fix compile

Browse Source
This commit is contained in:
dt
2009-11-30 12:45:10 +01:00
parent d6d48fa23c
commit 9984944171
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ bool QMakeStep::init()
if (QDir(workingDirectory).exists(QLatin1String("Makefile"))) { if (QDir(workingDirectory).exists(QLatin1String("Makefile"))) {
QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(workingDirectory); QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(workingDirectory);
if (qtVersion->qmakeCommand() == qmakePath) { if (qtVersion->qmakeCommand() == qmakePath) {
m_needToRunQMake = !qt4bc->compareBuildConfigurationToImportFrom(workingDirectory); m_needToRunQMake = !qt4bc->compareToImportFrom(workingDirectory);
} }
} }

2
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -506,7 +506,7 @@ QString MaemoRunConfiguration::maddeRoot() const
const QString MaemoRunConfiguration::sysRoot() const const QString MaemoRunConfiguration::sysRoot() const
{ {
if (const MaemoToolChain *tc = toolchain()) if (const MaemoToolChain *tc = toolchain())
return toolchain()->sysrootRoot(); return tc->sysrootRoot();
return QString(); return QString();
} }