From e71904e231e27e6f6f88b35c4a7e2d7cf8ba2640 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 16 Aug 2011 14:00:13 +0200 Subject: Remove V8 submodule from QtDeclarative QtDeclarative should now link against the QtV8 library from qtbase. The patch files have been moved to qtbase as well. Applications that use the QtDeclarative private headers may need to add the following to their .pro file: QT += v8-private This ensures that is found, which is (indirectly) included by many QtDeclarative private headers. Task-number: QTBUG-20963 Change-Id: I31e973a6fcc0c416d3b258a61c26564cee3dcd4b Reviewed-on: http://codereview.qt.nokia.com/3093 Reviewed-by: Qt Sanity Bot Reviewed-by: Kent Hansen --- src/imports/gestures/gestures.pro | 2 +- src/imports/particles/particles.pro | 2 +- src/imports/testlib/testlib.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/imports') diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index d94b402f4c..45483fc810 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 +QT += core-private gui-private v8-private declarative-private qtquick1 qtquick1-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 c73d068e2c..e054796d25 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 +QT += declarative opengl core gui v8-private declarative-private core-private gui-private qtquick1 qtquick1-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 += -- cgit v1.2.3