diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .tag | 1 | ||||
| -rw-r--r-- | modules/qt_declarative.pri | 10 | ||||
| -rw-r--r-- | src/declarative/declarative.pro | 6 | ||||
| -rw-r--r-- | src/declarative/util/util.pri | 2 | ||||
| -rw-r--r-- | src/imports/gestures/gestures.pro | 2 | ||||
| -rw-r--r-- | src/imports/particles/particles.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 | ||||
| -rw-r--r-- | sync.profile | 17 | ||||
| -rw-r--r-- | tools/qmlviewer/qml.pri | 2 |
10 files changed, 36 insertions, 9 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..a3c6108370 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.tag ident @@ -0,0 +1 @@ +$Id$ diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri index 7a54c6c3b2..59bc0fdd2b 100644 --- a/modules/qt_declarative.pri +++ b/modules/qt_declarative.pri @@ -1,12 +1,12 @@ -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.VERSION = 4.8.0 +QT.declarative.MAJOR_VERSION = 4 +QT.declarative.MINOR_VERSION = 8 +QT.declarative.PATCH_VERSION = 0 QT.declarative.name = QtDeclarative QT.declarative.bins = $$QT_MODULE_BIN_BASE QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative -QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private +QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/$$QT.declarative.VERSION QT.declarative.sources = $$QT_MODULE_BASE/src/declarative QT.declarative.libs = $$QT_MODULE_LIB_BASE QT.declarative.plugins = $$QT_MODULE_PLUGIN_BASE diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 8a0ae71919..0a1f76a251 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -2,7 +2,11 @@ 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 script-private network script opengl-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 diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index 62fa8f1664..5bc8b117c0 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -69,4 +69,6 @@ contains(QT_CONFIG, xmlpatterns) { QT+=xmlpatterns SOURCES += $$PWD/qdeclarativexmllistmodel.cpp HEADERS += $$PWD/qdeclarativexmllistmodel_p.h +} else { + DEFINES += QT_NO_XMLPATTERNS } diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 8ebf9a02f8..7ecd4b8afa 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -2,7 +2,7 @@ TARGET = qmlgesturesplugin TARGETPATH = Qt/labs/gestures include(../qimportbase.pri) -QT += declarative +QT += core-private gui-private declarative-private script-private SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index c04e640ba6..6eea892f83 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -48,6 +48,8 @@ HEADERS += \ deformableparticle.h \ pictureaffector.h +QT += core-private gui-private declarative-private + SOURCES += \ V1/qdeclarativeparticles.cpp \ spritestate.cpp \ diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index 6e365491ba..e5e28a4c38 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -1,7 +1,7 @@ load(qt_module) TARGET = qmldbg_tcp -QT += declarative network +QT += declarative-private network include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) diff --git a/sync.profile b/sync.profile index 77da8d8003..42ea13d9c3 100644 --- a/sync.profile +++ b/sync.profile @@ -13,3 +13,20 @@ %modulepris = ( "QtDeclarative" => "$basedir/modules/qt_declarative.pri", ); +# Modules and programs, and their dependencies. +# Each of the module version specifiers can take one of the following values: +# - A specific Git revision. +# - "LATEST_REVISION", to always test against the latest revision. +# - "LATEST_RELEASE", to always test against the latest public release. +# - "THIS_REPOSITORY", to indicate that the module is in this repository. +%dependencies = ( + "QtDeclarative" => { + "QtScript" => "4d15ca64fc7ca81bdadba9fbeb84d4e98a6c0edc", + "QtSvg" => "1a71611b6ceaf6cdb24ea485a818fc56c956b5f8", + "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", + "QtXmlPatterns" => "26edd6852a62aeec49712a53dcc8d4093192301c", + "QtNetwork" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", + "QtSql" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", + "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", + }, +); diff --git a/tools/qmlviewer/qml.pri b/tools/qmlviewer/qml.pri index cfc74af89d..9ac5adc50e 100644 --- a/tools/qmlviewer/qml.pri +++ b/tools/qmlviewer/qml.pri @@ -1,4 +1,4 @@ -QT += declarative script network sql +QT += core-private gui-private declarative-private script network sql contains(QT_CONFIG, opengl) { QT += opengl DEFINES += GL_SUPPORTED |