diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-01 10:23:48 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-01 10:23:48 -0400 |
| commit | c56201bdac81d3d74efa9437a7ed2cef4285de6d (patch) | |
| tree | 94e8e956c97dc28c0ba5ddf63658b7eb3eb49604 | |
| parent | 9d0ad814f6df30f5a94156f3aa0118d70e9fa34f (diff) | |
| parent | 963ddafeaabd2853002df66b6e873a379a75c45a (diff) | |
| download | cmake-c56201bdac81d3d74efa9437a7ed2cef4285de6d.tar.gz | |
Merge branch 'qt-5.13' into release-3.15
Merge-request: !3500
| -rw-r--r-- | Source/QtDialog/RegexExplorer.cxx | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/SameName/CMakeLists.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/QtDialog/RegexExplorer.cxx b/Source/QtDialog/RegexExplorer.cxx index cb67f85d48..746fd8af26 100644 --- a/Source/QtDialog/RegexExplorer.cxx +++ b/Source/QtDialog/RegexExplorer.cxx @@ -20,7 +20,7 @@ void RegexExplorer::setStatusColor(QWidget* widget, bool successful) QColor color = successful ? QColor(0, 127, 0) : Qt::red; QPalette palette = widget->palette(); - palette.setColor(QPalette::Foreground, color); + palette.setColor(QPalette::WindowText, color); widget->setPalette(palette); } diff --git a/Tests/QtAutogen/SameName/CMakeLists.txt b/Tests/QtAutogen/SameName/CMakeLists.txt index 8d4f71f65e..0a80d5eee7 100644 --- a/Tests/QtAutogen/SameName/CMakeLists.txt +++ b/Tests/QtAutogen/SameName/CMakeLists.txt @@ -37,7 +37,7 @@ if (QT_TEST_VERSION EQUAL 4) else() set(rccCompress "--compress") endif() -set_target_properties(sameName PROPERTIES AUTORCC_OPTIONS "${rccCompress};0" ) -set_source_files_properties(aaa/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};1" ) -set_source_files_properties(bbb/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};2" ) -set_source_files_properties(ccc/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};3" ) +set_target_properties(sameName PROPERTIES AUTORCC_OPTIONS "${rccCompress};1" ) +set_source_files_properties(aaa/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};2" ) +set_source_files_properties(bbb/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};3" ) +set_source_files_properties(ccc/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};4" ) |