summaryrefslogtreecommitdiffstats
path: root/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-09-27 18:11:50 +1000
committerJoona Petrell <joona.t.petrell@nokia.com>2010-10-04 17:24:10 +1000
commit22266dc0c407fca2c91f30531f9928d6d0702cb4 (patch)
tree3ee682c3e0cde1f4befbfdd0c26727f50b98fe7a /tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
parente43acca9eb186a212137913b6b81f00062447978 (diff)
Add QML support to feedback
Diffstat (limited to 'tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp')
-rw-r--r--tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
index 0858db0c94..f79145463a 100644
--- a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
+++ b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
@@ -53,6 +53,7 @@ Q_EXPORT_PLUGIN2(feedback_testplugin, QFeedbackTestPlugin)
QFeedbackTestPlugin::QFeedbackTestPlugin() : QObject(qApp)
{
+ actuators_ << createFeedbackActuator(this, 7357);
}
QFeedbackTestPlugin::~QFeedbackTestPlugin()
@@ -64,12 +65,9 @@ QFeedbackInterface::PluginPriority QFeedbackTestPlugin::pluginPriority()
return PluginLowPriority;
}
-QList<QFeedbackActuator> QFeedbackTestPlugin::actuators()
+QList<QFeedbackActuator*> QFeedbackTestPlugin::actuators()
{
- QList<QFeedbackActuator> ret;
- QFeedbackActuator testActuator = createFeedbackActuator(7357); // test actuator
- ret << testActuator;
- return ret;
+ return actuators_;
}
void QFeedbackTestPlugin::setActuatorProperty(const QFeedbackActuator &actuator, ActuatorProperty prop, const QVariant &value)