diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-12 01:00:11 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-12 12:23:29 +0200 |
| commit | 77d126ccb58aba85ab6f363c4314f8481aa0cf1d (patch) | |
| tree | 1e7f21f001bb1fce6f4af7bb4598b91d519f6355 /mkspecs | |
| parent | 3f8e754f07db944dc74d84cc1c24d3e11677ad09 (diff) | |
| parent | 786c58817187bb18552934c807ba7a7ea845f49e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
configure.pri
Also required s/solid\.color/solidColor/ in a couple of places in:
src/gui/painting/qpaintengine_raster.cpp
Change-Id: I29937f63e9779deb6dac7ae77e2948d06ebc0319
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 899a40103a..7ee1a956f4 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -304,7 +304,6 @@ headersclean:!internal_module { header_check.variable_out = PRE_TARGETDEPS header_check.name = headercheck ${QMAKE_FILE_IN} header_check.commands = $$hcleanCOMMAND - silent:header_check.commands = @echo compiling[header] ${QMAKE_FILE_IN} && $$hcleanCOMMAND QMAKE_EXTRA_COMPILERS += header_check } unset(hcleanCOMMAND) |