summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2010-11-25 15:20:01 +0100
committeraxis <qt-info@nokia.com>2011-04-27 12:05:47 +0200
commitd1d26eaf4d13220b460cbc3a69dd9fafb8c12e1a (patch)
tree4eb5a93fc1dc93db0192cf59f74f74a3ef2de21a
parent715b0251af3fd29bf54ad7387b3b80d65e07d23e (diff)
Make declarative compile.
-rw-r--r--modules/qt_declarative.pri9
-rw-r--r--src/declarative/declarative.pro6
-rw-r--r--sync.profile15
3 files changed, 28 insertions, 2 deletions
diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri
new file mode 100644
index 0000000000..5fb8c2507a
--- /dev/null
+++ b/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/src/declarative/declarative.pro b/src/declarative/declarative.pro
index b74b18c090..fdbb07072a 100644
--- a/src/declarative/declarative.pro
+++ b/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/sync.profile b/sync.profile
new file mode 100644
index 0000000000..77da8d8003
--- /dev/null
+++ b/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",
+);