diff options
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h')
-rw-r--r-- | src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h index 8152690879..765f38fae4 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h @@ -33,6 +33,8 @@ #ifndef QT4RUNCONFIGURATION_H #define QT4RUNCONFIGURATION_H +#include "qmakerunconfigurationfactory.h" + #include <projectexplorer/applicationrunconfiguration.h> #include <utils/environment.h> @@ -61,7 +63,6 @@ namespace ProjectExplorer { namespace Qt4ProjectManager { class Qt4Project; -class Qt4BaseTarget; class Qt4ProFileNode; class Qt4PriFileNode; @@ -76,17 +77,16 @@ class Qt4RunConfiguration : public ProjectExplorer::LocalApplicationRunConfigura friend class Qt4RunConfigurationFactory; public: - Qt4RunConfiguration(Qt4BaseTarget *parent, const QString &proFilePath); + Qt4RunConfiguration(ProjectExplorer::Target *parent, Core::Id id); virtual ~Qt4RunConfiguration(); - Qt4BaseTarget *qt4Target() const; - virtual bool isEnabled() const; virtual QString disabledReason() const; virtual QWidget *createConfigurationWidget(); virtual QString executable() const; virtual RunMode runMode() const; + bool forcedGuiMode() const; virtual QString workingDirectory() const; virtual QString commandLineArguments() const; virtual Utils::Environment environment() const; @@ -115,10 +115,11 @@ signals: void effectiveTargetInformationChanged(); private slots: + void profileChanged(); void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress); protected: - Qt4RunConfiguration(Qt4BaseTarget *parent, Qt4RunConfiguration *source); + Qt4RunConfiguration(ProjectExplorer::Target *parent, Qt4RunConfiguration *source); virtual bool fromMap(const QVariantMap &map); private: @@ -146,6 +147,7 @@ private: // Cached startup sub project information ProjectExplorer::LocalApplicationRunConfiguration::RunMode m_runMode; + bool m_forcedGuiMode; bool m_userSetName; bool m_isUsingDyldImageSuffix; QString m_userWorkingDirectory; @@ -204,23 +206,27 @@ private: bool m_isShown; }; -class Qt4RunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class Qt4RunConfigurationFactory : public QmakeRunConfigurationFactory { Q_OBJECT public: explicit Qt4RunConfigurationFactory(QObject *parent = 0); - virtual ~Qt4RunConfigurationFactory(); + ~Qt4RunConfigurationFactory(); - virtual bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const; - virtual ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id); - virtual bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; - virtual ProjectExplorer::RunConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); - virtual bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; - virtual ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source); + bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const; + ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id); + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; + ProjectExplorer::RunConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; + ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; QString displayNameForId(const Core::Id id) const; + + bool canHandle(ProjectExplorer::Target *t) const; + QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t, + ProjectExplorer::Node *n); }; } // namespace Internal |