forked from qt-creator/qt-creator
Always show the wizard even if we already have a recent enough cbp file.
That case is a corner case, it can happen if the user has run the codeblocks generator on the command line or if the user deleted the .user file. We mostly ask to get the user a chance to check that we set the correct generator. Or let him select the correct one if there are multiple msvc versions.
This commit is contained in:
@@ -58,7 +58,6 @@ public:
|
||||
enum PageId {
|
||||
InSourcePageId,
|
||||
ShadowBuildPageId,
|
||||
XmlFileUpToDatePageId,
|
||||
CMakeRunPageId
|
||||
};
|
||||
|
||||
@@ -85,9 +84,9 @@ public:
|
||||
ProjectExplorer::Environment environment() const;
|
||||
QString msvcVersion() const;
|
||||
void setMsvcVersion(const QString &version);
|
||||
bool existsUpToDateXmlFile() const;
|
||||
private:
|
||||
void init();
|
||||
bool existsUpToDateXmlFile() const;
|
||||
bool hasInSourceBuild() const;
|
||||
CMakeManager *m_cmakeManager;
|
||||
QString m_buildDirectory;
|
||||
@@ -107,17 +106,6 @@ private:
|
||||
CMakeOpenProjectWizard *m_cmakeWizard;
|
||||
};
|
||||
|
||||
|
||||
class XmlFileUpToDatePage : public QWizardPage
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
XmlFileUpToDatePage(CMakeOpenProjectWizard *cmakeWizard);
|
||||
private:
|
||||
CMakeOpenProjectWizard *m_cmakeWizard;
|
||||
};
|
||||
|
||||
|
||||
class ShadowBuildPage : public QWizardPage
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
Reference in New Issue
Block a user