Make sure the example (and feedback stack) enumerate actuators correctly.

The code in the hapticsplayer was doing some strange things.  Add an
autotest to check that two actuators from the test plugin show up
correctly.  This might also fix the "no feedback" issue on S60, if the
wrong actuator was passed to the backend.

Task-number: MOBILITY-1631, MOBILITY-1784

1 files changed, 4 insertions, 1 deletions

diff --git a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
index fe7d3cebf4..167389151c 100644
--- a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
+++ b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
@@ -53,7 +53,7 @@ Q_EXPORT_PLUGIN2(feedback_testplugin, QFeedbackTestPlugin)
 
         QFeedbackTestPlugin::QFeedbackTestPlugin() : QObject(qApp), mHapticState(QFeedbackEffect::Stopped), mFileState(QFeedbackEffect::Stopped)
 {
-    actuators_ << createFeedbackActuator(this, 7357);
+    actuators_ << createFeedbackActuator(this, 0) << createFeedbackActuator(this, 1);
     mHapticTimer.setSingleShot(true);
     connect(&mHapticTimer, SIGNAL(timeout()), this, SLOT(timerExpired()));
 }
@@ -85,7 +85,10 @@ QVariant QFeedbackTestPlugin::actuatorProperty(const QFeedbackActuator &actuator
 
     switch (prop) {
         case Name:
+        if (actuator.id() == 0)
             return QString(QLatin1String("test plugin"));
+        else
+            return QString(QLatin1String("5555"));
 
         case State:
             return static_cast<int>(QFeedbackActuator::Unknown);