summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-07-18 12:01:59 +0200
committerZeno Albisser <zeno.albisser@digia.com>2013-07-18 17:24:07 +0200
commit60ea7e1b4e6225885b85bb3dd368eeef4de6a31e (patch)
tree5dfcf9281d79f59d1f1eb4538e7bc1963f30c5e8 /lib
parente14f32db8374bec4dab395ecab3dced873283925 (diff)
Add a python script to generate the chromium .pak resource files.
This is necessary, because the pak files must be available when qmake checks for the dependencies for RESOURCES in lib.pro. Change-Id: Ia173c70746402b2fee09bfa035a9f8780e88cc94 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/lib.pro3
-rw-r--r--lib/lib_resources.qrc4
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/lib.pro b/lib/lib.pro
index 45d8675fd..a89129930 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -3,7 +3,6 @@
# our gyp_generator.prf feature to the CONFIG variable since it is processed backwards
CONFIG = gyp_generator $$CONFIG
GYPDEPENDENCIES += ../shared/shared.gyp:qtwebengine_shared
-GYPDEPENDENCIES += ../chromium/net/net.gyp:net_resources
GYPINCLUDES += ../qtwebengine.gypi
TEMPLATE = lib
@@ -22,6 +21,8 @@ CONFIG(release, debug|release): DEFINES += NDEBUG
QT += widgets quick
RESOURCES += lib_resources.qrc
+# We need this to find the include files generated for the .pak resource files.
+INCLUDEPATH += $$absolute_path(../resources, $$PWD)
SOURCES = \
backing_store_qt.cpp \
diff --git a/lib/lib_resources.qrc b/lib/lib_resources.qrc
index 4e6fce92a..af8448d2b 100644
--- a/lib/lib_resources.qrc
+++ b/lib/lib_resources.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="data">
- <file alias="resources.pak">/Users/zeno/work/qtwebengine/out/Release/gen/net/net_resources.pak</file>
+ <file alias="resources.pak">../resources/net_resources.pak</file>
</qresource>
-</RCC> \ No newline at end of file
+</RCC>