diff options
author | dt <qtc-committer@nokia.com> | 2009-03-16 17:33:05 +0100 |
---|---|---|
committer | dt <qtc-committer@nokia.com> | 2009-03-16 17:33:05 +0100 |
commit | 00951b6b969c439a36530bc5ec8dfbf8d8641288 (patch) | |
tree | 7f0ae118a838487fa1adc6d614178562093bc430 /src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h | |
parent | da4fcfbaf2b51ddb1205b72f8eec9e77e4925a91 (diff) | |
download | qt-creator-00951b6b969c439a36530bc5ec8dfbf8d8641288.tar.gz |
More progress on the CMake plugin
Made the cmake plugin even more usable by implementing:
Pop up a wizard if there is a .user file but no .cbp file. (Fixes empty
project reported on irc.)
Pop up a wizard if the .cbp file is older then the CMakeLists.txt file,
thus reparsing the file. (Note: There is a bug that we need to actually
also check the last modified of all included files.)
Reparse the cbp file to add new RunConfigurations / delete no longer
existing RunConfigurations and update those that have changed.-
Show a nicer title in the Projects/RunConfiguration pane
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h index 0cbdc49c8e..8d7e212620 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h @@ -4,6 +4,7 @@ #include <QtCore/QProcess> #include <QtGui/QPushButton> #include <QtGui/QLineEdit> +#include <QtGui/QLabel> #include <QtGui/QWizard> #include <QtGui/QPlainTextEdit> @@ -29,6 +30,7 @@ public: CMakeRunPageId }; CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory); + CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, const QStringList &needToCreate, const QStringList &needToUpdate); virtual int nextId() const; QString buildDirectory() const; QString sourceDirectory() const; @@ -43,6 +45,7 @@ private: QString m_buildDirectory; QString m_sourceDirectory; QStringList m_arguments; + bool m_creatingCbpFiles; }; class InSourceBuildPage : public QWizardPage @@ -82,6 +85,7 @@ class CMakeRunPage : public QWizardPage Q_OBJECT public: CMakeRunPage(CMakeOpenProjectWizard *cmakeWizard); + CMakeRunPage(CMakeOpenProjectWizard *cmakeWizard, const QString &buildDirectory, bool update); virtual void cleanupPage(); virtual bool isComplete() const; private slots: @@ -89,12 +93,15 @@ private slots: void cmakeFinished(); void cmakeReadyRead(); private: + void initWidgets(); CMakeOpenProjectWizard *m_cmakeWizard; QPlainTextEdit *m_output; QPushButton *m_runCMake; QProcess *m_cmakeProcess; QLineEdit *m_argumentsLineEdit; + QLabel *m_descriptionLabel; bool m_complete; + QString m_buildDirectory; }; } |