summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qmakestep.h
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-01-12 16:24:00 +0100
committerKai Koehne <kai.koehne@nokia.com>2011-02-18 12:57:45 +0100
commit3fef120d5929dd1ae162a6eb86be76ee473ac10b (patch)
tree727566892c31de76c57a99326988533c8a3a1201 /src/plugins/qt4projectmanager/qmakestep.h
parent45187a15a787a51bd096ec533e7ecf6495410ec7 (diff)
downloadqt-creator-3fef120d5929dd1ae162a6eb86be76ee473ac10b.tar.gz
QmlJSDebug: Move qmljsdebug into a static library
Reviewed-by: dt
Diffstat (limited to 'src/plugins/qt4projectmanager/qmakestep.h')
-rw-r--r--src/plugins/qt4projectmanager/qmakestep.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index a1e82bbc1d..24869cf0c1 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -95,11 +95,15 @@ public:
QStringList parserArguments();
QString userArguments();
void setUserArguments(const QString &arguments);
+ bool linkQmlDebuggingLibrary() const;
+ void setLinkQmlDebuggingLibrary(bool enable);
+ bool isQmlDebuggingLibrarySupported(QString *reason = 0) const;
QVariantMap toMap() const;
signals:
void userArgumentsChanged();
+ void linkQmlDebuggingLibraryChanged();
protected:
QMakeStep(ProjectExplorer::BuildStepList *parent, QMakeStep *source);
@@ -117,6 +121,7 @@ private:
bool m_forced;
bool m_needToRunQMake; // set in init(), read in run()
QString m_userArgs;
+ bool m_linkQmlDebuggingLibrary;
bool m_scriptTemplate;
QList<ProjectExplorer::Task> m_tasks;
};
@@ -135,12 +140,20 @@ private slots:
void qtVersionChanged();
void qmakeBuildConfigChanged();
void userArgumentsChanged();
+ void linkQmlDebuggingLibraryChanged();
// slots for dealing with user changes in our UI
void qmakeArgumentsLineEdited();
void buildConfigurationSelected();
+ void linkQmlDebuggingLibraryChecked(bool checked);
+
+ // other
+ void buildQmlDebuggingHelper();
+ void debuggingHelperBuildFinished();
+
private:
void updateSummaryLabel();
+ void updateQmlDebuggingWarningsLabel();
void updateEffectiveQMakeCall();
Ui::QMakeStep m_ui;
QMakeStep *m_step;