Commit 1aa0b150 authored by Tobias Hunger's avatar Tobias Hunger

CMake: Clean up CMakeOpenProjectWizard

Change-Id: Iffa47255df160da86717dde3c3333c204945c179
Reviewed-by: default avatarCristian Adam <cristian.adam@gmail.com>
Reviewed-by: default avatarNiels Weber <niels.weber@theqtcompany.com>
Reviewed-by: default avatarTim Jenssen <tim.jenssen@theqtcompany.com>
parent 4756fbbf
......@@ -91,10 +91,8 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cm
m_cmakeManager(cmakeManager),
m_sourceDirectory(info->sourceDirectory),
m_environment(info->environment),
m_kit(0)
m_kit(KitManager::find(info->kitId))
{
m_kit = KitManager::find(info->kitId);
CMakeRunPage::Mode rmode;
if (mode == CMakeOpenProjectWizard::NeedToCreate)
rmode = CMakeRunPage::Recreate;
......
......@@ -113,9 +113,11 @@ public:
NoKitPage(CMakeOpenProjectWizard *cmakeWizard);
bool isComplete() const override;
void initializePage() override;
private slots:
void kitsChanged();
void showOptions();
private:
QLabel *m_descriptionLabel;
QPushButton *m_optionsButton;
......@@ -136,9 +138,10 @@ class ShadowBuildPage : public QWizardPage
Q_OBJECT
public:
explicit ShadowBuildPage(CMakeOpenProjectWizard *cmakeWizard, bool change = false);
private slots:
void buildDirectoryChanged();
private:
void buildDirectoryChanged();
CMakeOpenProjectWizard *m_cmakeWizard;
Utils::PathChooser *m_pc;
};
......@@ -149,10 +152,11 @@ class NoCMakePage : public QWizardPage
public:
NoCMakePage(CMakeOpenProjectWizard *cmakeWizard);
bool isComplete() const;
private slots:
private:
void cmakeToolsChanged();
void showOptions();
private:
QLabel *m_descriptionLabel;
QPushButton *m_optionsButton;
};
......@@ -172,14 +176,16 @@ public:
virtual bool validatePage();
virtual void cleanupPage();
virtual bool isComplete() const;
private slots:
private:
void runCMake();
void cmakeFinished();
void cmakeReadyReadStandardOutput();
void cmakeReadyReadStandardError();
private:
void initWidgets();
QByteArray cachedGeneratorFromFile(const QString &cache);
CMakeOpenProjectWizard *m_cmakeWizard;
QPlainTextEdit *m_output;
QPushButton *m_runCMake;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment