projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
QQuickCanvas renames
[profile/ivi/qtdeclarative.git]
/
tests
/
auto
/
quick
/
quick.pro
diff --git
a/tests/auto/quick/quick.pro
b/tests/auto/quick/quick.pro
index
4065dbf
..
82592a9
100644
(file)
--- a/
tests/auto/quick/quick.pro
+++ b/
tests/auto/quick/quick.pro
@@
-1,12
+1,14
@@
TEMPLATE = subdirs
PUBLICTESTS += \
TEMPLATE = subdirs
PUBLICTESTS += \
- examples \
geometry \
geometry \
- nodes \
rendernode \
qquickpixmapcache
rendernode \
qquickpixmapcache
+!contains(QT_CONFIG, no-widgets): PUBLICTESTS += nodes
+
+!cross_compile: PUBLICTESTS += examples
+
# This test requires the qtconcurrent module
!contains(QT_CONFIG, concurrent):PUBLICTESTS -= qquickpixmapcache
# This test requires the qtconcurrent module
!contains(QT_CONFIG, concurrent):PUBLICTESTS -= qquickpixmapcache
@@
-15,9
+17,11
@@
PRIVATETESTS += \
qquickapplication \
qquickbehaviors \
qquickfontloader \
qquickapplication \
qquickbehaviors \
qquickfontloader \
+ qquickimageprovider \
qquickpath \
qquicksmoothedanimation \
qquickspringanimation \
qquickpath \
qquicksmoothedanimation \
qquickspringanimation \
+ qquickanimationcontroller \
qquickstyledtext \
qquickstates \
qquicksystempalette \
qquickstyledtext \
qquickstates \
qquicksystempalette \
@@
-38,8
+42,9
@@
QUICKTESTS = \
qquickanimatedimage \
qquickanimatedsprite \
qquickborderimage \
qquickanimatedimage \
qquickanimatedsprite \
qquickborderimage \
- qquick
canvas
\
+ qquick
window
\
qquickdrag \
qquickdrag \
+ qquickdroparea \
qquickflickable \
qquickflipable \
qquickfocusscope \
qquickflickable \
qquickflipable \
qquickfocusscope \
@@
-55,6
+60,7
@@
QUICKTESTS = \
qquickpathview \
qquickpincharea \
qquickpositioners \
qquickpathview \
qquickpincharea \
qquickpositioners \
+ qquickrectangle \
qquickrepeater \
qquickshadereffect \
qquickspritesequence \
qquickrepeater \
qquickshadereffect \
qquickspritesequence \
@@
-65,6
+71,7
@@
QUICKTESTS = \
qquickview \
qquickcanvasitem \
qquickscreen \
qquickview \
qquickcanvasitem \
qquickscreen \
+ touchmouse \
SUBDIRS += $$PUBLICTESTS
SUBDIRS += $$PUBLICTESTS