Skip to content

Commit

Permalink
rcc: Change two-pass feature from opt-out to opt-in
Browse files Browse the repository at this point in the history
This makes the 'big-data' feature introduced and made mandatory with
commit 5395180 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: Oswald Buddenhagen <[email protected]>
Reviewed-by: Fawzi Mohamed <[email protected]>
Reviewed-by: Tor Arne Vestbø <[email protected]>
Reviewed-by: Frederik Gladhorn <[email protected]>
  • Loading branch information
hjk authored and Jani Heikkinen committed Nov 15, 2014
1 parent e783923 commit 68862c7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mkspecs/features/resources.prf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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

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.commands = $$QMAKE_RCC $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
Expand Down

0 comments on commit 68862c7

Please sign in to comment.