From 9ba6f06af77fd5f74c77d413564393fb6e6f6553 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 4 Dec 2009 21:41:49 +0100
Subject: [PATCH] don't call setQtVersion() - createProFileReader() already
does it
---
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp | 1 -
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 1 -
.../qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp | 1 -
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 1 -
4 files changed, 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index f7ae389ffe5..0a7db2ecca8 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -575,7 +575,6 @@ void MaemoRunConfiguration::updateTarget()
QtVersion *qtVersion = qt4bc->qtVersion();
ProFileReader *reader = priFileNode->createProFileReader();
reader->setCumulative(false);
- reader->setQtVersion(qtVersion);
// Find out what flags we pass on to qmake
QStringList addedUserConfigArguments;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 432deed02b4..fdc71b7e100 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -291,7 +291,6 @@ void S60DeviceRunConfiguration::updateTarget()
QtVersion *qtVersion = qt4bc->qtVersion();
ProFileReader *reader = priFileNode->createProFileReader();
reader->setCumulative(false);
- reader->setQtVersion(qtVersion);
// Find out what flags we pass on to qmake
QStringList addedUserConfigArguments;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index 8f5244e0323..6cc31e211cc 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -138,7 +138,6 @@ void S60EmulatorRunConfiguration::updateTarget()
QtVersion *qtVersion = qt4bc->qtVersion();
ProFileReader *reader = priFileNode->createProFileReader();
reader->setCumulative(false);
- reader->setQtVersion(qtVersion);
// Find out what flags we pass on to qmake
QStringList addedUserConfigArguments;
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 1f912efb278..9125fdf2db2 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -574,7 +574,6 @@ void Qt4RunConfiguration::updateTarget()
}
ProFileReader *reader = priFileNode->createProFileReader();
reader->setCumulative(false);
- reader->setQtVersion(qt4bc->qtVersion());
// Find out what flags we pass on to qmake
QStringList addedUserConfigArguments;
--
GitLab