From d899bfaa70cfbab7b2ed338b472ef3d94749d926 Mon Sep 17 00:00:00 2001
From: Jaakko Korpela <jaakko.korpela@nokia.com>
Date: Thu, 29 Sep 2011 16:39:35 +0300
Subject: 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>
---
 qtfeedback.pro      | 14 +++++++-------
 tests/auto/auto.pro | 15 ++++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/qtfeedback.pro b/qtfeedback.pro
index 498ce1e..407d955 100644
--- a/qtfeedback.pro
+++ b/qtfeedback.pro
@@ -4,12 +4,12 @@ CONFIG += ordered
 module_qtfeedback_src.subdir = src
 module_qtfeedback_src.target = module-qtfeedback-src
 
-#module_qtfeedback_tests.subdir = tests
-#module_qtfeedback_tests.target = module-qtfeedback-tests
-#module_qtfeedback_tests.depends = module_qtfeedback_src
-#!contains(QT_BUILD_PARTS,tests) {
-#    module_qtfeedback_tests.CONFIG = no_default_target no_default_install
-#}
+module_qtfeedback_tests.subdir = tests
+module_qtfeedback_tests.target = module-qtfeedback-tests
+module_qtfeedback_tests.depends = module_qtfeedback_src
+!contains(QT_BUILD_PARTS,tests) {
+    module_qtfeedback_tests.CONFIG = no_default_target no_default_install
+}
 
 SUBDIRS += module_qtfeedback_src \
-#           module_qtfeedback_tests
+           module_qtfeedback_tests
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
+#}
 
-- 
cgit v1.2.3