diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 18:20:00 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 18:20:00 +0100 |
| commit | f013c41d05c82e853a3418d4e980329e1f883b7a (patch) | |
| tree | 87318eea4f6f06556673c64a64044d49a97a28e6 /src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | |
| parent | 187bb36945a653cdf9738a6563475c87b9db911d (diff) | |
| parent | 0afa004c0b929ee722037bee26c1c45910fda8c5 (diff) | |
| download | qt-creator-f013c41d05c82e853a3418d4e980329e1f883b7a.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index 26bb9f6856..e39fa1cf87 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -75,8 +75,9 @@ using namespace CMakeProjectManager::Internal; /// CMakeOpenProjectWizard ////////////// -CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, Utils::Environment env) - : m_cmakeManager(cmakeManager), +CMakeOpenProjectWizard::CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cmakeManager, const QString &sourceDirectory, Utils::Environment env) + : Utils::Wizard(parent), + m_cmakeManager(cmakeManager), m_sourceDirectory(sourceDirectory), m_environment(env), m_useNinja(false), @@ -101,9 +102,10 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const init(); } -CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, CMakeOpenProjectWizard::Mode mode, +CMakeOpenProjectWizard::CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cmakeManager, CMakeOpenProjectWizard::Mode mode, const CMakeBuildInfo *info) - : m_cmakeManager(cmakeManager), + : Utils::Wizard(parent), + m_cmakeManager(cmakeManager), m_sourceDirectory(info->sourceDirectory), m_environment(info->environment), m_useNinja(info->useNinja), |