diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
| commit | 71478352376022faa9be6d79f2a760c289945ff5 (patch) | |
| tree | 0f8ff4a88c1b033367337a93d23a329d145ee903 /src/imports | |
| parent | c38efcb67cf93ba3e91e184c3b891efef4ef75a3 (diff) | |
| parent | 05daa9bfe1a03ffe1cc580b6cfd88e093e2493c0 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/declarative/declarative.pro
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgshadereffectsource_p.h
src/declarative/items/qsgview.cpp
src/declarative/particles/qsgcustomparticle.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
src/qtquick1/qtquick1.pro
tests/auto/declarative/examples/examples.pro
tests/auto/declarative/qsglistview/qsglistview.pro
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/gestures/gestures.pro | 2 | ||||
| -rw-r--r-- | src/imports/gestures/qdeclarativegesturearea.cpp | 3 | ||||
| -rw-r--r-- | src/imports/particles/particles.pro | 2 | ||||
| -rw-r--r-- | src/imports/testlib/testlib.pro | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 3b735efac5..e7095956b2 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 += core-private gui-private declarative-private qtquick1 qtquick1-private widgets-private +QT += core-private gui-private declarative-private qtquick1 qtquick1-private widgets-private v8-private SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp index c0d88a3318..1631831c7f 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -46,6 +46,7 @@ #include <qdeclarativeinfo.h> #include <private/qdeclarativeproperty_p.h> +#include <private/qdeclarativescript_p.h> #include <QtQuick1/private/qdeclarativeitem_p.h> #include <QtCore/qdebug.h> @@ -196,7 +197,7 @@ QDeclarativeGestureAreaParser::compile(const QList<QDeclarativeCustomParserPrope error(props.at(ii), QDeclarativeGestureArea::tr("GestureArea: syntax error")); return QByteArray(); } else { - QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(value); + QDeclarativeScript::Variant v = qvariant_cast<QDeclarativeScript::Variant>(value); if (v.isScript()) { ds << propName; ds << int(type); diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 79906563f8..74dab8dcf3 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -9,7 +9,7 @@ SOURCES += \ particles.cpp \ V1/qdeclarativeparticles.cpp -QT += declarative opengl core gui declarative-private core-private gui-private qtquick1 qtquick1-private widgets-private +QT += declarative opengl core gui declarative-private core-private gui-private qtquick1 qtquick1-private widgets-private v8-private OTHER_FILES += \ qmldir diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro index 5adde2ae85..da072d34b1 100644 --- a/src/imports/testlib/testlib.pro +++ b/src/imports/testlib/testlib.pro @@ -21,7 +21,7 @@ symbian { } -QT += declarative qmltest qmltest-private declarative-private core-private testlib +QT += declarative qmltest qmltest-private v8-private declarative-private core-private testlib SOURCES += main.cpp HEADERS += |