diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-10-17 11:13:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-17 11:13:18 (GMT) |
| commit | 792863ac290dbacad80c4b074ce64c29687d2837 (patch) | |
| tree | cc5f6687324eacd9354bea35e2cec2537746cfa2 /Tests | |
| parent | e1d124286ab662d666e241bc0948445a8c26c817 (diff) | |
| parent | d471406f0b41b99579cb07770302555c138d47a0 (diff) | |
| download | CMake-792863ac290dbacad80c4b074ce64c29687d2837.zip CMake-792863ac290dbacad80c4b074ce64c29687d2837.tar.gz CMake-792863ac290dbacad80c4b074ce64c29687d2837.tar.bz2 | |
Merge topic 'cmake-gui-disable-presets' into release-3.19
d471406f0b CMake GUI: Disable preset fields instead of hiding them
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5374
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeGUI/CMakeGUITest.cxx | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/Tests/CMakeGUI/CMakeGUITest.cxx b/Tests/CMakeGUI/CMakeGUITest.cxx index 5a6bec3..2b5d973 100644 --- a/Tests/CMakeGUI/CMakeGUITest.cxx +++ b/Tests/CMakeGUI/CMakeGUITest.cxx @@ -356,16 +356,14 @@ void CMakeGUITest::changingPresets() QCOMPARE(this->m_window->Preset->presetName(), QString{}); QCOMPARE(this->m_window->Preset->presets().size(), 0); QCOMPARE(this->m_window->BinaryDirectory->currentText(), ""); - QCOMPARE(this->m_window->Preset->isHidden(), true); - QCOMPARE(this->m_window->PresetLabel->isHidden(), true); + QCOMPARE(this->m_window->Preset->isEnabled(), false); writePresets("build1", { "preset" }); loopSleep(1500); QCOMPARE(this->m_window->Preset->presetName(), QString{}); QCOMPARE(this->m_window->Preset->presets().size(), 1); QCOMPARE(this->m_window->BinaryDirectory->currentText(), ""); - QCOMPARE(this->m_window->Preset->isHidden(), false); - QCOMPARE(this->m_window->PresetLabel->isHidden(), false); + QCOMPARE(this->m_window->Preset->isEnabled(), true); this->m_window->Preset->setPresetName("preset"); loopSleep(); @@ -373,8 +371,7 @@ void CMakeGUITest::changingPresets() QCOMPARE(this->m_window->Preset->presets().size(), 1); QCOMPARE(this->m_window->BinaryDirectory->currentText(), CMakeGUITest_BINARY_DIR "/changingPresets/src/build1/preset"); - QCOMPARE(this->m_window->Preset->isHidden(), false); - QCOMPARE(this->m_window->PresetLabel->isHidden(), false); + QCOMPARE(this->m_window->Preset->isEnabled(), true); writePresets("build2", { "preset2", "preset" }); loopSleep(1500); @@ -382,8 +379,7 @@ void CMakeGUITest::changingPresets() QCOMPARE(this->m_window->Preset->presets().size(), 2); QCOMPARE(this->m_window->BinaryDirectory->currentText(), CMakeGUITest_BINARY_DIR "/changingPresets/src/build1/preset"); - QCOMPARE(this->m_window->Preset->isHidden(), false); - QCOMPARE(this->m_window->PresetLabel->isHidden(), false); + QCOMPARE(this->m_window->Preset->isEnabled(), true); writePresets("build3", { "preset2" }); loopSleep(1500); @@ -391,8 +387,7 @@ void CMakeGUITest::changingPresets() QCOMPARE(this->m_window->Preset->presets().size(), 1); QCOMPARE(this->m_window->BinaryDirectory->currentText(), CMakeGUITest_BINARY_DIR "/changingPresets/src/build1/preset"); - QCOMPARE(this->m_window->Preset->isHidden(), false); - QCOMPARE(this->m_window->PresetLabel->isHidden(), false); + QCOMPARE(this->m_window->Preset->isEnabled(), true); this->m_window->Preset->setPresetName("preset2"); loopSleep(); @@ -400,8 +395,7 @@ void CMakeGUITest::changingPresets() QCOMPARE(this->m_window->Preset->presets().size(), 1); QCOMPARE(this->m_window->BinaryDirectory->currentText(), CMakeGUITest_BINARY_DIR "/changingPresets/src/build3/preset2"); - QCOMPARE(this->m_window->Preset->isHidden(), false); - QCOMPARE(this->m_window->PresetLabel->isHidden(), false); + QCOMPARE(this->m_window->Preset->isEnabled(), true); QDir::root().mkpath(CMakeGUITest_BINARY_DIR "/changingPresets/src2"); QFile::copy(CMakeGUITest_BINARY_DIR "/changingPresets/src/CMakePresets.json", @@ -414,8 +408,7 @@ void CMakeGUITest::changingPresets() QCOMPARE(this->m_window->Preset->presets().size(), 1); QCOMPARE(this->m_window->BinaryDirectory->currentText(), CMakeGUITest_BINARY_DIR "/changingPresets/src/build3/preset2"); - QCOMPARE(this->m_window->Preset->isHidden(), false); - QCOMPARE(this->m_window->PresetLabel->isHidden(), false); + QCOMPARE(this->m_window->Preset->isEnabled(), true); this->m_window->Preset->setPresetName("preset2"); loopSleep(); @@ -423,8 +416,7 @@ void CMakeGUITest::changingPresets() QCOMPARE(this->m_window->Preset->presets().size(), 1); QCOMPARE(this->m_window->BinaryDirectory->currentText(), CMakeGUITest_BINARY_DIR "/changingPresets/src2/build3/preset2"); - QCOMPARE(this->m_window->Preset->isHidden(), false); - QCOMPARE(this->m_window->PresetLabel->isHidden(), false); + QCOMPARE(this->m_window->Preset->isEnabled(), true); QFile(CMakeGUITest_BINARY_DIR "/changingPresets/src2/CMakePresets.json") .remove(); @@ -433,8 +425,7 @@ void CMakeGUITest::changingPresets() QCOMPARE(this->m_window->Preset->presets().size(), 0); QCOMPARE(this->m_window->BinaryDirectory->currentText(), CMakeGUITest_BINARY_DIR "/changingPresets/src2/build3/preset2"); - QCOMPARE(this->m_window->Preset->isHidden(), true); - QCOMPARE(this->m_window->PresetLabel->isHidden(), true); + QCOMPARE(this->m_window->Preset->isEnabled(), false); } void SetupDefaultQSettings() |