diff options
| author | Martin Duffy <martin.duffy@kitware.com> | 2023-03-22 17:11:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-03-29 14:41:19 (GMT) |
| commit | 19305afd8a2a46925b1a880de68f7be0ad1f3091 (patch) | |
| tree | cdef4417cd852c2a5dd85886df4ff61d7fd2e653 /Source/QtDialog/QCMake.h | |
| parent | 6b08358e17f5b85ad04ab512e4b6e39e989cea35 (diff) | |
| download | CMake-19305afd8a2a46925b1a880de68f7be0ad1f3091.zip CMake-19305afd8a2a46925b1a880de68f7be0ad1f3091.tar.gz CMake-19305afd8a2a46925b1a880de68f7be0ad1f3091.tar.bz2 | |
presets: Improve JSON parser and error messages
Diffstat (limited to 'Source/QtDialog/QCMake.h')
| -rw-r--r-- | Source/QtDialog/QCMake.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h index 8a7e4cb..0890558 100644 --- a/Source/QtDialog/QCMake.h +++ b/Source/QtDialog/QCMake.h @@ -60,7 +60,6 @@ using QCMakePropertyList = QList<QCMakeProperty>; Q_DECLARE_METATYPE(QCMakeProperty) Q_DECLARE_METATYPE(QCMakePropertyList) Q_DECLARE_METATYPE(QProcessEnvironment) -Q_DECLARE_METATYPE(cmCMakePresetsGraph::ReadFileResult) /// Qt API for CMake library. /// Wrapper like class allows for easier integration with @@ -158,8 +157,7 @@ signals: /// signal when the selected preset changes void presetChanged(const QString& name); /// signal when there's an error reading the presets files - void presetLoadError(const QString& dir, - cmCMakePresetsGraph::ReadFileResult error); + void presetLoadError(const QString& dir, const QString& error); /// signal when uninitialized warning changes void warnUninitializedModeChanged(bool value); /// signal for progress events @@ -203,8 +201,7 @@ protected: QString Toolset; std::vector<cmake::GeneratorInfo> AvailableGenerators; cmCMakePresetsGraph CMakePresetsGraph; - cmCMakePresetsGraph::ReadFileResult LastLoadPresetsResult = - cmCMakePresetsGraph::ReadFileResult::READ_OK; + bool LastLoadPresetsResult = true; QString PresetName; QString CMakeExecutable; QAtomicInt InterruptFlag; |