Commit 68862c72 authored by hjk's avatar hjk Committed by Jani Heikkinen
Browse files

rcc: Change two-pass feature from opt-out to opt-in

This makes the 'big-data' feature introduced and made mandatory with
commit 5395180f

 opt-in trough CONFIG += resources_big.

Since the feature has been introduced several setups have been
found where the feature cannot be used, or not be used out-of-the-box.
Using the traditional default behavior lowers the risk of further
breakages.

Change-Id: Ifd04204adadeec539e962d6a9a6955f63781bd36
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: default avatarFawzi Mohamed <fawzi.mohamed@theqtcompany.com>
Reviewed-by: default avatarTor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: default avatarFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
parent e7839239
No related merge requests found
Showing with 1 addition and 1 deletion
...@@ -11,7 +11,7 @@ rcc.name = RCC ${QMAKE_FILE_IN} ...@@ -11,7 +11,7 @@ rcc.name = RCC ${QMAKE_FILE_IN}
rcc.depend_command = $$QMAKE_RCC_DEP -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} rcc.depend_command = $$QMAKE_RCC_DEP -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN}
rcc.CONFIG += add_inputs_as_makefile_deps rcc.CONFIG += add_inputs_as_makefile_deps
resources_small|ltcg|macx-xcode|contains(TEMPLATE, "vc.*") { !resources_big|ltcg|macx-xcode|contains(TEMPLATE, "vc.*") {
rcc.output = $$RCC_DIR/$${first(QMAKE_MOD_RCC)}_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)} rcc.output = $$RCC_DIR/$${first(QMAKE_MOD_RCC)}_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)}
rcc.commands = $$QMAKE_RCC $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} rcc.commands = $$QMAKE_RCC $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment