From 90ff2cdea3126bdff2746ecf868004711ea628b1 Mon Sep 17 00:00:00 2001 From: axis Date: Wed, 27 Apr 2011 12:34:43 +0200 Subject: Added dependency information to the sync.profile. --- sync.profile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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", + }, +); -- cgit v1.2.3 From 9c0cf384fac57c4c8470459901022429fad1a8a7 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Fri, 1 Apr 2011 05:47:28 -0500 Subject: Add module.prf, and install MODULE_PRI for each module Output warning if not present --- src/declarative/declarative.pro | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index fdbb07072a..a54284fe6f 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -2,6 +2,10 @@ load(qt_module) TARGET = QtDeclarative QPRO_PWD = $$PWD + +CONFIG += module +MODULE_PRI += ../../modules/qt_declarative.pri + QT = core gui script network contains(QT_CONFIG, svg): QT += svg DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING -- cgit v1.2.3 From 23131cd3240f71a333e4a6fc58a68b4b830ea2b3 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 6 Apr 2011 15:33:13 +0200 Subject: Define the QT_NO_.... when the module is absant from QT_CONFIG Task-number: QTMODULARIZATION-38 --- src/declarative/util/util.pri | 2 ++ 1 file changed, 2 insertions(+) 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 } -- cgit v1.2.3 From 8017c9a69084ec492128b0511bc055fe2702cda7 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 21 Apr 2011 07:55:54 -0500 Subject: Use private headers --- modules/qt_declarative.pri | 10 +++++----- src/declarative/declarative.pro | 2 +- src/imports/gestures/gestures.pro | 2 +- src/imports/particles/particles.pro | 2 +- tools/qmlviewer/qml.pri | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri index d4dfecd365..fe69b5f105 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 a54284fe6f..4c2e380540 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -6,7 +6,7 @@ QPRO_PWD = $$PWD CONFIG += module MODULE_PRI += ../../modules/qt_declarative.pri -QT = core gui script network +QT = core-private gui-private script-private network 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/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 ba570f77a3..5f39b08405 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -2,7 +2,7 @@ TARGET = qmlparticlesplugin TARGETPATH = Qt/labs/particles include(../qimportbase.pri) -QT += declarative +QT += core-private gui-private declarative-private SOURCES += \ qdeclarativeparticles.cpp \ 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 -- cgit v1.2.3 From 4cf4c7b9bcd74846ea53319d32b6374c71fea967 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 2 May 2011 16:54:54 +0200 Subject: Fix compilation with private header patch --- src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index 14113fb072..e5e28a4c38 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -1,5 +1,7 @@ +load(qt_module) + TARGET = qmldbg_tcp -QT += declarative network +QT += declarative-private network include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) -- cgit v1.2.3 From dbbcc4dff099d5cf41a3253f922b785889e17545 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 3 May 2011 16:21:07 +0200 Subject: Added .tag file with Git revision. --- .gitattributes | 1 + .tag | 1 + 2 files changed, 2 insertions(+) create mode 100644 .gitattributes create mode 100644 .tag diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..a3c6108370 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.tag ident diff --git a/.tag b/.tag new file mode 100644 index 0000000000..055c8729cd --- /dev/null +++ b/.tag @@ -0,0 +1 @@ +$Id$ -- cgit v1.2.3