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

CMake: always fallback to path cmake

Browse Source 
We used to only fallback at start time from a invalid/empty setting
to the cmake in path. Now we do that even if the setting is later
edited.

Task-Nr: QTCREATORBUG-3739
This commit is contained in:
dt
2011-02-09 14:21:26 +01:00
parent 3f42c75e50
commit 35ce2acd7e
2 changed files with 104 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
View File

@@ -92,6 +92,16 @@ private:
CMakeSettingsPage *m_settingsPage;
};
struct CMakeValidator
{
enum STATE { VALID, INVALID, RUNNING };
STATE state;
QProcess *process;
bool hasCodeBlocksMsvcGenerator;
QString version;
QString executable;
};
class CMakeSettingsPage : public Core::IOptionsPage
{
Q_OBJECT
@@ -110,22 +120,21 @@ public:
QString cmakeExecutable() const;
void setCMakeExecutable(const QString &executable);
bool isCMakeExecutableValid();
bool isCMakeExecutableValid() const;
bool hasCodeBlocksMsvcGenerator() const;
private slots:
void cmakeFinished();
void userCmakeFinished();
void pathCmakeFinished();
private:
void cmakeFinished(CMakeValidator *cmakeValidator) const;
void saveSettings() const;
void startProcess();
QString findCmakeExecutable() const;
void updateInfo();
void startProcess(CMakeValidator *cmakeValidator);
void updateInfo(CMakeValidator *cmakeValidator);
Utils::PathChooser *m_pathchooser;
QString m_cmakeExecutable;
enum STATE { VALID, INVALID, RUNNING } m_state;
QProcess *m_process;
QString m_version;
bool m_hasCodeBlocksMsvcGenerator;
mutable CMakeValidator m_userCmake;
mutable CMakeValidator m_pathCmake;
};
} // namespace Internal