From 151366dffa298af0df73e29798851886a4c49d5e Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 14 Jul 2009 15:28:07 +0200
Subject: [PATCH] isQt64Bit is a better name.
Since that method actually checks if Qt is built 64bit,
not if MSVC is 64bit.
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 4 ++--
src/plugins/qt4projectmanager/qtversionmanager.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 0a3a730ed48..6e49ff08dd2 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -894,7 +894,7 @@ ProjectExplorer::ToolChain *QtVersion::createToolChain(ProjectExplorer::ToolChai
tempToolchain = ProjectExplorer::ToolChain::createMinGWToolChain(qmake_cxx, mingwDirectory());
//qDebug()<<"Mingw ToolChain";
} else if(type == ProjectExplorer::ToolChain::MSVC) {
- tempToolchain = ProjectExplorer::ToolChain::createMSVCToolChain(msvcVersion(), isMSVC64Bit());
+ tempToolchain = ProjectExplorer::ToolChain::createMSVCToolChain(msvcVersion(), isQt64Bit());
//qDebug()<<"MSVC ToolChain ("<<version->msvcVersion()<<")";
} else if(type == ProjectExplorer::ToolChain::WINCE) {
tempToolchain = ProjectExplorer::ToolChain::createWinCEToolChain(msvcVersion(), wincePlatform());
@@ -1138,7 +1138,7 @@ QString QtVersion::examplesPath() const
return m_versionInfo["QT_INSTALL_EXAMPLES"];
}
-bool QtVersion::isMSVC64Bit() const
+bool QtVersion::isQt64Bit() const
{
const QString make = qmakeCommand();
// qDebug() << make;
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index 92083643873..6debdcc9d24 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -111,7 +111,7 @@ public:
QString demosPath() const;
int uniqueId() const;
- bool isMSVC64Bit() const;
+ bool isQt64Bit() const;
enum QmakeBuildConfig
{
--
GitLab