diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2023-04-12 13:06:53 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-17 21:32:46 +0000 |
| commit | 3e799aa197d1281f059d34137a53c51cb452fef7 (patch) | |
| tree | ef5f04b12f18929ebf76a39bb4ef37228bfc5e0d /mkspecs | |
| parent | c8c5a2b984aea84e853de912f53f4ebce88c5189 (diff) | |
qmake: Fix infinite make loop if RESOURCES contains nonexistent .qrc
If RESOURCES contained a non-existent .qrc file, qmake produced
Makefiles that resulted in an infinite loop when running GNU Make.
Introduce a new extra compiler CONFIG value "remove_no_exist" that
removes non-existent extra compiler input. This value is now used in the
extra compiler that handles the RESOURCES variable.
The difference to the existing CONFIG value "ignore_no_exist" is that
qmake still prints a warning about the non-existent file.
Fixes: QTBUG-112743
Change-Id: I3293af75b75f217e1a1738b49da0af1117cfdecb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 0aa9b08536b640fe5e8e55d3c6615d00f30763ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/resources.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index 7fbd16d3bd..ab9761a83c 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -13,7 +13,7 @@ qtEnsurePluginResourcesCpp() rcc.input = RESOURCES rcc.name = RCC ${QMAKE_FILE_IN} rcc.depend_command = $$QMAKE_RCC_DEP -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} -rcc.CONFIG += add_inputs_as_makefile_deps dep_lines +rcc.CONFIG += add_inputs_as_makefile_deps dep_lines remove_no_exist !resources_big|ltcg|macx-xcode|wasm|contains(TEMPLATE, "vc.*") { |