Merge branch 'master' into refactor

[profile/ivi/qtdeclarative.git] / src / declarative / declarative.pro

diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 8a0ae71..7f4255f 100644 (file)
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -2,7 +2,12 @@ load(qt_module)
 
 TARGET     = QtDeclarative
 QPRO_PWD   = $$PWD
-QT         = core gui script network
+
+CONFIG += module
+MODULE_PRI += ../../modules/qt_declarative.pri
+
+QT         = core-private gui-private network opengl opengl-private widgets-private
+
 contains(QT_CONFIG, svg): QT += svg
 DEFINES   += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
@@ -15,18 +20,21 @@ exists("qdeclarative_enable_gcov") {
     LIBS += -lgcov
 }
 
-include($$QT_SOURCE_TREE/src/qbase.pri)
+load(qt_module_config)
+
+HEADERS += qtdeclarativeversion.h
 
 #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
 #DESTDIR=.
 
 #modules
 include(util/util.pri)
-include(graphicsitems/graphicsitems.pri)
 include(qml/qml.pri)
 include(debugger/debugger.pri)
 include(scenegraph/scenegraph.pri)
 include(items/items.pri)
+include(particles/particles.pri)
+include(v8/v8.pri)
 
 symbian: {
     TARGET.UID3=0x2001E623
@@ -45,3 +53,4 @@ linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND
 DEFINES += QT_NO_OPENTYPE
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
 
+