summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-07-18 19:56:26 +0200
committerZeno Albisser <zeno.albisser@digia.com>2013-07-19 17:12:35 +0200
commitc8c6be89630242f220263f3a0633dd493dec0ce6 (patch)
tree5baece511991882baf39a973158aee0937661403 /resources
parenta95c6266282e17aa17642c6a03e234b067eb5599 (diff)
Fixing Qt Resource System Integration.
Add logic to functions.prf and gyp_generator.prf to invoke rcc from ninja as well. Since we are building the whole library with ninja, this is the only feasible way to get the dependencies right. Changine the TEMPLATE of resources.pro from subdirs to aux, since it is not building a library and not processing subdirectories either. Change-Id: I23dff04e488d839bb54e343588da98e5e9059b23 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/resources.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/resources/resources.pro b/resources/resources.pro
index 77d5077c2..a9404f3ec 100644
--- a/resources/resources.pro
+++ b/resources/resources.pro
@@ -1,6 +1,6 @@
# This is a dummy .pro file used to prepare chromium .pak resource files.
# These files will then be bundled using the Qt Resource System.
-TEMPLATE = subdirs
+TEMPLATE = aux
system(python ../build/scripts/build_resources.py)