diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:24 +1000 |
|---|---|---|
| committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:54 +1000 |
| commit | 0284817d6cd7e17afa8da26ee6e9199100754446 (patch) | |
| tree | c351d55d5a606c81c72e481f846b9b9e2603c883 /tests/auto/quick/quick.pro | |
| parent | 377eb94eb19dafeca20d12bc6b624f1779fae514 (diff) | |
| parent | 36bd7f616f37f5f60e59bce1f0d8970248d627de (diff) | |
Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
Diffstat (limited to 'tests/auto/quick/quick.pro')
| -rw-r--r-- | tests/auto/quick/quick.pro | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index 6fba193790..4065dbf508 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -8,7 +8,7 @@ PUBLICTESTS += \ qquickpixmapcache # This test requires the qtconcurrent module -!contains(QT_CONFIG, concurrent):PUBLICTESTS -= qqmlpixmapcache +!contains(QT_CONFIG, concurrent):PUBLICTESTS -= qquickpixmapcache PRIVATETESTS += \ qquickanimations \ @@ -25,16 +25,21 @@ PRIVATETESTS += \ qquickxmllistmodel # This test requires the xmlpatterns module -!contains(QT_CONFIG,xmlpatterns):PRIVATETESTS -= qqmlxmllistmodel +!contains(QT_CONFIG,xmlpatterns):PRIVATETESTS -= qquickxmllistmodel + +# FIXME +# qquickdroparea is disabled because it depends on changes that +# have not been merged from qtbase/master to qtbase/api_changes yet: + #qquickdroparea \ QUICKTESTS = \ qquickaccessible \ qquickanchors \ qquickanimatedimage \ + qquickanimatedsprite \ qquickborderimage \ qquickcanvas \ qquickdrag \ - qquickdroparea \ qquickflickable \ qquickflipable \ qquickfocusscope \ @@ -52,7 +57,7 @@ QUICKTESTS = \ qquickpositioners \ qquickrepeater \ qquickshadereffect \ - qquickspriteimage \ + qquickspritesequence \ qquicktext \ qquicktextedit \ qquicktextinput \ |