diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index b8b7a9bcb64e6c8652cd9f4a799f590e12bcf4a2..b51748f33fa70b4754bb701bf07b8299e61d8c5b 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -319,9 +319,9 @@ void CMakeRunConfiguration::setEnabled(bool b)
setDefaultDisplayName(defaultDisplayName());
}
-bool CMakeRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *bc) const
+bool CMakeRunConfiguration::isEnabled() const
{
- return m_enabled && LocalApplicationRunConfiguration::isEnabled(bc);
+ return m_enabled;
}
// Configuration widget
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
index fd003d10897aff648706e3cc419e29ea8f3b1e77..7e4413d069f0b7ad2e171e7cf2fd5b2d8a731dac 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
@@ -90,8 +90,7 @@ public:
void setEnabled(bool b);
- bool isEnabled(ProjectExplorer::BuildConfiguration *bc) const;
- using LocalApplicationRunConfiguration::isEnabled;
+ bool isEnabled() const;
signals:
void baseEnvironmentChanged();
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 5ab9f62fc40fae313188703bdadbc62a69b08419..f33c8e5566c4d26433bb592c123be8b0ab4725fd 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2262,7 +2262,6 @@ QString ProjectExplorerPlugin::pathFor(Node *node)
return pathOrDirectoryFor(node, false);
}
-
QString ProjectExplorerPlugin::directoryFor(Node *node)
{
return pathOrDirectoryFor(node, true);
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 41580a619dda4ee77f60a5fc8183a536b9e00fa2..6e56f6ac02d7556ed218917d59a9f3f29be3eb46 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -198,13 +198,11 @@ void RunConfiguration::addExtraAspects()
}
/*!
- \brief Used to find out whether a runconfiguration works with the given buildconfiguration.
- \note bc may be 0!
+ \brief Used to find out whether a runconfiguration is enabled
*/
-bool RunConfiguration::isEnabled(BuildConfiguration *bc) const
+bool RunConfiguration::isEnabled() const
{
- Q_UNUSED(bc);
return true;
}
@@ -214,18 +212,6 @@ bool RunConfiguration::isEnabled(BuildConfiguration *bc) const
\brief Returns the widget used to configure this run configuration. Ownership is transferred to the caller
*/
-/*!
- \brief Used to find out whether a runconfiguration works with the active buildconfiguration.
-*/
-
-bool RunConfiguration::isEnabled() const
-{
- if (target()->project()->hasActiveBuildSettings()
- && !activeBuildConfiguration())
- return false;
- return isEnabled(activeBuildConfiguration());
-}
-
BuildConfiguration *RunConfiguration::activeBuildConfiguration() const
{
if (!target())
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 5fa5c95a4017de2ccb736ea7b3a7272efcfb62d5..94095fa6051a90db19c022b932815584178b5287 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -59,8 +59,7 @@ class PROJECTEXPLORER_EXPORT RunConfiguration : public ProjectConfiguration
public:
virtual ~RunConfiguration();
- virtual bool isEnabled(BuildConfiguration *bc) const;
- bool isEnabled() const;
+ virtual bool isEnabled() const;
virtual QWidget *createConfigurationWidget() = 0;
Target *target() const;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 7bd9f526e169af2c7771211f7cde762d3d7d174d..07d6ac1f0734657f41b82dcb2b907d879e42d70a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -86,10 +86,8 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(QmlProjectTarget *parent,
updateQtVersions();
}
-bool QmlProjectRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *bc) const
+bool QmlProjectRunConfiguration::isEnabled() const
{
- Q_UNUSED(bc);
-
return m_isEnabled;
}
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
index 53462d57b7ce6ce1fee2e0ef727e675332657a53..247692b6bcf0ccfa3f68983834e5349d65d46e66 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
@@ -97,7 +97,7 @@ public:
Utils::Environment environment() const;
// RunConfiguration
- bool isEnabled(ProjectExplorer::BuildConfiguration *bc) const;
+ bool isEnabled() const;
virtual QWidget *createConfigurationWidget();
Utils::OutputFormatter *createOutputFormatter() const;
QVariantMap toMap() const;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index bc1b879b41d6eb4b57b35e7885b7209326be741e..80174fa27916295657d4bb8f9ef4c093a48609a8 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -138,11 +138,9 @@ Qt4DesktopTarget *Qt4RunConfiguration::qt4Target() const
return static_cast<Qt4DesktopTarget *>(target());
}
-bool Qt4RunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration * /* configuration */) const
+bool Qt4RunConfiguration::isEnabled() const
{
- if (!m_parseSuccess)
- return false;
- return true;
+ return m_parseSuccess;
}
void Qt4RunConfiguration::handleParseState(bool success)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
index f68c0d6d770d40cc640fd59d35c62656bb159a68..645c287ddf81b1a8dda2788ccd1969d5945d13d1 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
@@ -82,8 +82,7 @@ public:
Qt4DesktopTarget *qt4Target() const;
- virtual bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
- using ProjectExplorer::LocalApplicationRunConfiguration::isEnabled;
+ virtual bool isEnabled() const;
virtual QWidget *createConfigurationWidget();
virtual QString executable() const;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 1c62ea7a457f949cc1bab5b032ef398ef9936cff..39ce10b1b10740109a593264520b8a33c9fbfad7 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -156,16 +156,9 @@ Qt4SymbianTarget *S60DeviceRunConfiguration::qt4Target() const
return static_cast<Qt4SymbianTarget *>(target());
}
-bool S60DeviceRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
+bool S60DeviceRunConfiguration::isEnabled() const
{
- if (!m_validParse)
- return false;
-
- Q_ASSERT(configuration->target() == target());
- Q_ASSERT(target()->id() == Constants::S60_DEVICE_TARGET_ID);
-
- const Qt4BuildConfiguration *qt4bc = qobject_cast<const Qt4BuildConfiguration *>(configuration);
- return qt4bc && qt4bc->toolChain();
+ return m_validParse;
}
QWidget *S60DeviceRunConfiguration::createConfigurationWidget()
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 0b72c5a8fac563163a34fca7ac1e0dc0a6727ca1..28131ddec19e095e88d11f4ff319cf316e124063 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -67,8 +67,7 @@ public:
Qt4SymbianTarget *qt4Target() const;
SymbianQtVersion *qtVersion() const;
- using ProjectExplorer::RunConfiguration::isEnabled;
- bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
+ bool isEnabled() const;
QWidget *createConfigurationWidget();
Utils::OutputFormatter *createOutputFormatter() const;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index 888b5f5524e8597174e7a86404d1f7b5ee5dae22..ebe575706e95a751048889658f0797e24255ad4d 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -140,15 +140,9 @@ Qt4SymbianTarget *S60EmulatorRunConfiguration::qt4Target() const
return static_cast<Qt4SymbianTarget *>(target());
}
-bool S60EmulatorRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
+bool S60EmulatorRunConfiguration::isEnabled() const
{
- if (!m_validParse)
- return false;
- Q_ASSERT(configuration->target() == target());
- Q_ASSERT(target()->id() == Constants::S60_EMULATOR_TARGET_ID);
-
- const Qt4BuildConfiguration *qt4bc = qobject_cast<const Qt4BuildConfiguration *>(configuration);
- return qt4bc && qt4bc->toolChain();
+ return m_validParse;
}
QWidget *S60EmulatorRunConfiguration::createConfigurationWidget()
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
index 616462d12599366b5662822276d645c386b1d2a4..e9d285cabd50e7211061ed3a7f1209918dea76b5 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
@@ -68,8 +68,7 @@ public:
Qt4SymbianTarget *qt4Target() const;
- using ProjectExplorer::RunConfiguration::isEnabled;
- bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
+ bool isEnabled() const;
QWidget *createConfigurationWidget();
Utils::OutputFormatter *createOutputFormatter() const;
diff --git a/src/plugins/remotelinux/maemorunconfiguration.cpp b/src/plugins/remotelinux/maemorunconfiguration.cpp
index 7b993b8490735a7c6ddaded1c21bbf57388788bf..23699041cbe0ff43bc46313ab21099b4c861e05e 100644
--- a/src/plugins/remotelinux/maemorunconfiguration.cpp
+++ b/src/plugins/remotelinux/maemorunconfiguration.cpp
@@ -129,11 +129,9 @@ Qt4BuildConfiguration *MaemoRunConfiguration::activeQt4BuildConfiguration() cons
return static_cast<Qt4BuildConfiguration *>(activeBuildConfiguration());
}
-bool MaemoRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration * /* config */) const
+bool MaemoRunConfiguration::isEnabled() const
{
- if (!m_validParse)
- return false;
- return true;
+ return m_validParse;
}
QWidget *MaemoRunConfiguration::createConfigurationWidget()
diff --git a/src/plugins/remotelinux/maemorunconfiguration.h b/src/plugins/remotelinux/maemorunconfiguration.h
index 232cb9905e722e57cd353037d43ae3f788c0ce9d..064555a3ec5fca0441296291d95d99657ead23fb 100644
--- a/src/plugins/remotelinux/maemorunconfiguration.h
+++ b/src/plugins/remotelinux/maemorunconfiguration.h
@@ -80,8 +80,7 @@ public:
const QString &proFilePath);
virtual ~MaemoRunConfiguration();
- using ProjectExplorer::RunConfiguration::isEnabled;
- bool isEnabled(ProjectExplorer::BuildConfiguration *config) const;
+ bool isEnabled() const;
QWidget *createConfigurationWidget();
Utils::OutputFormatter *createOutputFormatter() const;
Qt4ProjectManager::Qt4BaseTarget *qt4Target() const;