Commit 01285af3 authored by Gunnar Sletta's avatar Gunnar Sletta

Merge branch 'master' into qtquick2

Conflicts:
	src/imports/particles/particles.pro
parents 16f58282 dbbcc4df
$Id$
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
......
......@@ -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
......
......@@ -69,4 +69,6 @@ contains(QT_CONFIG, xmlpatterns) {
QT+=xmlpatterns
SOURCES += $$PWD/qdeclarativexmllistmodel.cpp
HEADERS += $$PWD/qdeclarativexmllistmodel_p.h
} else {
DEFINES += QT_NO_XMLPATTERNS
}
......@@ -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
......
......@@ -48,6 +48,8 @@ HEADERS += \
deformableparticle.h \
pictureaffector.h
QT += core-private gui-private declarative-private
SOURCES += \
V1/qdeclarativeparticles.cpp \
spritestate.cpp \
......
load(qt_module)
TARGET = qmldbg_tcp
QT += declarative network
QT += declarative-private network
include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
......
......@@ -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",
},
);
QT += declarative script network sql
QT += core-private gui-private declarative-private script network sql
contains(QT_CONFIG, opengl) {
QT += opengl
DEFINES += GL_SUPPORTED
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment