summaryrefslogtreecommitdiffstats
path: root/patches/0019-Make-declarative-compile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/0019-Make-declarative-compile.patch')
-rw-r--r--patches/0019-Make-declarative-compile.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/patches/0019-Make-declarative-compile.patch b/patches/0019-Make-declarative-compile.patch
index 1b62218..8b0f49b 100644
--- a/patches/0019-Make-declarative-compile.patch
+++ b/patches/0019-Make-declarative-compile.patch
@@ -4,20 +4,20 @@ Date: Thu, 25 Nov 2010 15:20:01 +0100
Subject: [PATCH] Make declarative compile.
---
- qtquick/modules/qt_declarative.pri | 9 +++++++++
- qtquick/src/declarative/declarative.pro | 6 ++++--
- qtquick/sync.profile | 15 +++++++++++++++
+ qtdeclarative/modules/qt_declarative.pri | 9 +++++++++
+ qtdeclarative/src/declarative/declarative.pro | 6 ++++--
+ qtdeclarative/sync.profile | 15 +++++++++++++++
qtscript/modules/qt_script.pri | 2 +-
qtscript/modules/qt_scripttools.pri | 2 +-
5 files changed, 30 insertions(+), 4 deletions(-)
- create mode 100644 qtquick/modules/qt_declarative.pri
- create mode 100644 qtquick/sync.profile
+ create mode 100644 qtdeclarative/modules/qt_declarative.pri
+ create mode 100644 qtdeclarative/sync.profile
-diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
+diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
new file mode 100644
index 0000000..5fb8c25
--- /dev/null
-+++ b/qtquick/modules/qt_declarative.pri
++++ b/qtdeclarative/modules/qt_declarative.pri
@@ -0,0 +1,9 @@
+QT_DECLARATIVE_VERSION = $$QT_VERSION
+QT_DECLARATIVE_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -28,10 +28,10 @@ index 0000000..5fb8c25
+QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative
+QT.declarative.libs = $$QT_MODULE_LIB_BASE
+QT.declarative.depends = gui script network
-diff --git a/qtquick/src/declarative/declarative.pro b/qtquick/src/declarative/declarative.pro
+diff --git a/qtdeclarative/src/declarative/declarative.pro b/qtdeclarative/src/declarative/declarative.pro
index b74b18c..fdbb070 100644
---- a/qtquick/src/declarative/declarative.pro
-+++ b/qtquick/src/declarative/declarative.pro
+--- a/qtdeclarative/src/declarative/declarative.pro
++++ b/qtdeclarative/src/declarative/declarative.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
@@ -54,11 +54,11 @@ index b74b18c..fdbb070 100644
-INCLUDEPATH += ../3rdparty/harfbuzz/src
+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
-diff --git a/qtquick/sync.profile b/qtquick/sync.profile
+diff --git a/qtdeclarative/sync.profile b/qtdeclarative/sync.profile
new file mode 100644
index 0000000..77da8d8
--- /dev/null
-+++ b/qtquick/sync.profile
++++ b/qtdeclarative/sync.profile
@@ -0,0 +1,15 @@
+%modules = ( # path to module name map
+ "QtDeclarative" => "$basedir/src/declarative",