From 631968c32343b2798e8dd97656ee0ecf679c0d0f Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Thu, 25 Nov 2010 15:20:01 +0100
Subject: [PATCH] Make declarative compile.

---
 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 qtdeclarative/modules/qt_declarative.pri
 create mode 100644 qtdeclarative/sync.profile

diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
new file mode 100644
index 0000000..5fb8c25
--- /dev/null
+++ b/qtdeclarative/modules/qt_declarative.pri
@@ -0,0 +1,9 @@
+QT_DECLARATIVE_VERSION = $$QT_VERSION
+QT_DECLARATIVE_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT_DECLARATIVE_MINOR_VERSION = $$QT_MINOR_VERSION
+QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION
+
+QT.declarative.name = QtDeclarative
+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/qtdeclarative/src/declarative/declarative.pro b/qtdeclarative/src/declarative/declarative.pro
index b74b18c..fdbb070 100644
--- a/qtdeclarative/src/declarative/declarative.pro
+++ b/qtdeclarative/src/declarative/declarative.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
 TARGET     = QtDeclarative
 QPRO_PWD   = $$PWD
 QT         = core gui script network
@@ -13,7 +15,7 @@ exists("qdeclarative_enable_gcov") {
     LIBS += -lgcov
 }
 
-include(../qbase.pri)
+include($$QT_SOURCE_TREE/src/qbase.pri)
 
 #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
 #DESTDIR=.
@@ -39,5 +41,5 @@ symbian: {
 linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND
 
 DEFINES += QT_NO_OPENTYPE
-INCLUDEPATH += ../3rdparty/harfbuzz/src
+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
 
diff --git a/qtdeclarative/sync.profile b/qtdeclarative/sync.profile
new file mode 100644
index 0000000..77da8d8
--- /dev/null
+++ b/qtdeclarative/sync.profile
@@ -0,0 +1,15 @@
+%modules = ( # path to module name map
+    "QtDeclarative" => "$basedir/src/declarative",
+);
+%moduleheaders = ( # restrict the module headers to those found in relative path
+);
+%classnames = (
+);
+%mastercontent = (
+    "gui" => "#include <QtGui/QtGui>\n",
+    "script" => "#include <QtScript/QtScript>\n",
+    "network" => "#include <QtNetwork/QtNetwork>\n",
+);
+%modulepris = (
+    "QtDeclarative" => "$basedir/modules/qt_declarative.pri",
+);
diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri
index cf04bf9..d0dcd2d 100644
--- a/qtscript/modules/qt_script.pri
+++ b/qtscript/modules/qt_script.pri
@@ -4,6 +4,6 @@ QT_SCRIPT_MINOR_VERSION = $$QT_MINOR_VERSION
 QT_SCRIPT_PATCH_VERSION = $$QT_PATCH_VERSION
 
 QT.script.name = QtScript
-QT.script.includes = $$QT_MODULE_INCLUDE_BASE/QtScript
+QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript
 QT.script.libs = $$QT_MODULE_LIB_BASE
 QT.script.depends = core
diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri
index 2ed4324..a39e22a 100644
--- a/qtscript/modules/qt_scripttools.pri
+++ b/qtscript/modules/qt_scripttools.pri
@@ -4,6 +4,6 @@ QT_SCRIPTTOOLS_MINOR_VERSION = $$QT_MINOR_VERSION
 QT_SCRIPTTOOLS_PATCH_VERSION = $$QT_PATCH_VERSION
 
 QT.scripttools.name = QtScriptTools
-QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE/QtScriptTools
+QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScriptTools
 QT.scripttools.libs = $$QT_MODULE_LIB_BASE
 QT.scripttools.depends = script gui network
-- 
1.7.3.2.343.g7d43d