aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@nokia.com>2011-09-16 16:34:27 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-16 17:27:46 +0200
commit99b8e14a69bc33033d6ae6a9d49cd884edbdcaa8 (patch)
tree00238d3e146ae7cf455ac4da068a8ba8035f0eb2
parentbdf09f2dbb5e747f627da39428ca068f65898f7c (diff)
Re-enable commented tests.
The tests used QWidget class so widgets library have to be added to pro file. QDeclarativestates works fine. Change-Id: I55c0798a37c3a894b774ba71671569fe007a49d7 Reviewed-on: http://codereview.qt-project.org/5104 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
-rw-r--r--tests/auto/declarative/declarative.pro8
-rw-r--r--tests/auto/declarative/nodes/nodes.pro2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro2
-rw-r--r--tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro2
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index b92dd4229d..4bda9422d9 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -7,14 +7,14 @@ METATYPETESTS += \
PUBLICTESTS += \
# examples \
geometry \
-# nodes \
+ nodes \
parserstress \
qdeclarativecomponent \
qdeclarativecontext \
qdeclarativeengine \
qdeclarativeerror \
qdeclarativefolderlistmodel \
-# qdeclarativeinfo \
+ qdeclarativeinfo \
qdeclarativelistreference \
qdeclarativemoduleplugin \
qdeclarativepixmapcache \
@@ -35,7 +35,7 @@ PRIVATETESTS += \
qdeclarativedebugclient \
qdeclarativedebugservice \
# qdeclarativedebugjs \
-# qdeclarativeecmascript \
+ qdeclarativeecmascript \
qdeclarativeimageprovider \
qdeclarativeinstruction \
qdeclarativelanguage \
@@ -47,7 +47,7 @@ PRIVATETESTS += \
qdeclarativespringanimation \
qdeclarativestyledtext \
qdeclarativesqldatabase \
-# qdeclarativestates \
+ qdeclarativestates \
# qdeclarativesystempalette \
qdeclarativetimer \
qdeclarativevaluetypes \
diff --git a/tests/auto/declarative/nodes/nodes.pro b/tests/auto/declarative/nodes/nodes.pro
index 19d3b09a43..8fda2f649d 100644
--- a/tests/auto/declarative/nodes/nodes.pro
+++ b/tests/auto/declarative/nodes/nodes.pro
@@ -1,5 +1,5 @@
load(qttest_p4)
-QT += opengl declarative
+QT += opengl declarative widgets
TARGET = tst_nodestest
macx:CONFIG -= app_bundle
diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
index afdeadb232..981cad5036 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
+++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
@@ -1,5 +1,5 @@
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative network
+contains(QT_CONFIG,declarative): QT += declarative network widgets
macx:CONFIG -= app_bundle
SOURCES += tst_qdeclarativeecmascript.cpp \
diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
index 9687c1ad5f..ddca3d3530 100644
--- a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
+++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
@@ -1,5 +1,5 @@
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+contains(QT_CONFIG,declarative): QT += declarative widgets
macx:CONFIG -= app_bundle
SOURCES += tst_qdeclarativeinfo.cpp