summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJaakko Korpela <jaakko.korpela@nokia.com>2011-09-29 16:39:35 +0300
committerQt by Nokia <qt-info@nokia.com>2011-09-30 09:57:19 +0200
commitd899bfaa70cfbab7b2ed338b472ef3d94749d926 (patch)
treeb8b5052c0091d594299758f5ad06761a2d6886de /tests
parent53c6bac948d6ae3c57da32096121508987cae819 (diff)
Enable feedback plugin and multimedia kit tests
These tests do not require xcb plugin can can be run on OBS Change-Id: I6baeac672b1aada0e4f6c75a3c02f43116db3de5 Reviewed-on: http://codereview.qt-project.org/5806 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index da1c2ae..02226db 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,13 +1,14 @@
TEMPLATE = subdirs
-SUBDIRS += qfeedbackactuator \
- qfeedbackhapticseffect \
- qfeedbackplugin \
- qfeedbacknoplugins
+#SUBDIRS += qfeedbackactuator \
+# qfeedbackhapticseffect \
+# qfeedbackplugin \
+# qfeedbacknoplugins
+SUBDIRS += qfeedbackplugin
# this is the same condition that enables the mmk plugin
equals(QT_MAJOR_VERSION, 4) : greaterThan(QT_MINOR_VERSION, 6):contains(mobility_modules,multimedia): SUBDIRS += qfeedbackmmk
-contains(QT_CONFIG, declarative) {
- SUBDIRS += qdeclarativefeedback
-}
+#contains(QT_CONFIG, declarative) {
+# SUBDIRS += qdeclarativefeedback
+#}