From 99849441713819bafacdea987b4ef32f34796f0b Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 30 Nov 2009 12:45:10 +0100
Subject: [PATCH] Fix compile
---
src/plugins/qt4projectmanager/qmakestep.cpp | 2 +-
.../qt4projectmanager/qt-maemo/maemorunconfiguration.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 2110e15458a..385cd1d7026 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -137,7 +137,7 @@ bool QMakeStep::init()
if (QDir(workingDirectory).exists(QLatin1String("Makefile"))) {
QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(workingDirectory);
if (qtVersion->qmakeCommand() == qmakePath) {
- m_needToRunQMake = !qt4bc->compareBuildConfigurationToImportFrom(workingDirectory);
+ m_needToRunQMake = !qt4bc->compareToImportFrom(workingDirectory);
}
}
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 3e329ef6589..f8e0b6a5488 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -506,7 +506,7 @@ QString MaemoRunConfiguration::maddeRoot() const
const QString MaemoRunConfiguration::sysRoot() const
{
if (const MaemoToolChain *tc = toolchain())
- return toolchain()->sysrootRoot();
+ return tc->sysrootRoot();
return QString();
}
--
GitLab