mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qt-5.13' into release-3.15

Browse Source 
Merge-request: !3500
This commit is contained in:
Brad King
2019-07-01 10:23:48 -04:00
parent 9d0ad814f6 963ddafeaa
commit c56201bdac
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/QtDialog/RegexExplorer.cxx
View File

@@ -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);
}

8
Tests/QtAutogen/SameName/CMakeLists.txt
View File

@@ -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" )