feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Clean up CMakeOpenProjectWizard

Browse Source 
Change-Id: Iffa47255df160da86717dde3c3333c204945c179
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-06 15:05:04 +01:00
parent 4756fbbfec
commit 1aa0b15096
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -91,10 +91,8 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cm
m_cmakeManager(cmakeManager), m_cmakeManager(cmakeManager),
m_sourceDirectory(info->sourceDirectory), m_sourceDirectory(info->sourceDirectory),
m_environment(info->environment), m_environment(info->environment),
m_kit(0) m_kit(KitManager::find(info->kitId))
{ {
m_kit = KitManager::find(info->kitId);
CMakeRunPage::Mode rmode; CMakeRunPage::Mode rmode;
if (mode == CMakeOpenProjectWizard::NeedToCreate) if (mode == CMakeOpenProjectWizard::NeedToCreate)
rmode = CMakeRunPage::Recreate; rmode = CMakeRunPage::Recreate;

18
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
View File

@@ -113,9 +113,11 @@ public:
NoKitPage(CMakeOpenProjectWizard *cmakeWizard); NoKitPage(CMakeOpenProjectWizard *cmakeWizard);
bool isComplete() const override; bool isComplete() const override;
void initializePage() override; void initializePage() override;
private slots: private slots:
void kitsChanged(); void kitsChanged();
void showOptions(); void showOptions();
private: private:
QLabel *m_descriptionLabel; QLabel *m_descriptionLabel;
QPushButton *m_optionsButton; QPushButton *m_optionsButton;
@@ -136,9 +138,10 @@ class ShadowBuildPage : public QWizardPage
Q_OBJECT Q_OBJECT
public: public:
explicit ShadowBuildPage(CMakeOpenProjectWizard *cmakeWizard, bool change = false); explicit ShadowBuildPage(CMakeOpenProjectWizard *cmakeWizard, bool change = false);
private slots:
void buildDirectoryChanged();
private: private:
void buildDirectoryChanged();
CMakeOpenProjectWizard *m_cmakeWizard; CMakeOpenProjectWizard *m_cmakeWizard;
Utils::PathChooser *m_pc; Utils::PathChooser *m_pc;
}; };
@@ -149,10 +152,11 @@ class NoCMakePage : public QWizardPage
public: public:
NoCMakePage(CMakeOpenProjectWizard *cmakeWizard); NoCMakePage(CMakeOpenProjectWizard *cmakeWizard);
bool isComplete() const; bool isComplete() const;
private slots:
private:
void cmakeToolsChanged(); void cmakeToolsChanged();
void showOptions(); void showOptions();
private:
QLabel *m_descriptionLabel; QLabel *m_descriptionLabel;
QPushButton *m_optionsButton; QPushButton *m_optionsButton;
}; };
@@ -172,14 +176,16 @@ public:
virtual bool validatePage(); virtual bool validatePage();
virtual void cleanupPage(); virtual void cleanupPage();
virtual bool isComplete() const; virtual bool isComplete() const;
private slots:
private:
void runCMake(); void runCMake();
void cmakeFinished(); void cmakeFinished();
void cmakeReadyReadStandardOutput(); void cmakeReadyReadStandardOutput();
void cmakeReadyReadStandardError(); void cmakeReadyReadStandardError();
private:
void initWidgets(); void initWidgets();
QByteArray cachedGeneratorFromFile(const QString &cache); QByteArray cachedGeneratorFromFile(const QString &cache);
CMakeOpenProjectWizard *m_cmakeWizard; CMakeOpenProjectWizard *m_cmakeWizard;
QPlainTextEdit *m_output; QPlainTextEdit *m_output;
QPushButton *m_runCMake; QPushButton *m_runCMake;