summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-09-26 12:42:38 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-26 19:54:34 +0200
commit9362474805fa4d58a9f457c647aa8011b28b84d0 (patch)
tree1e4366596be5acebd3c85d10adaecdf55acf7297 /src/plugins
parentc4e736cf9d0ff9cecfa03c1e6386957c7de706da (diff)
Fix initial window orientation with Qt on MeeGo 1.2 Harmattan
The window orientation changes are handled through a generic QPA plugin and sends an initial window orientation change event on startup for the initial orientation and subsequent updates when the device orientation changes. Unfortunately the plugin was never loaded after the introduction of the new plugin loading mechanism, because the factory key ("MeeGoIntegration") was not provided to the plugin registry. Change-Id: Ib7324561993abfbac1dccb0839aab0a8e870d231 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/generic/meego/main.cpp2
-rw-r--r--src/plugins/generic/meego/meego.json3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/generic/meego/main.cpp b/src/plugins/generic/meego/main.cpp
index 36ef6a1fbf..b99e386e29 100644
--- a/src/plugins/generic/meego/main.cpp
+++ b/src/plugins/generic/meego/main.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
class QMeeGoIntegrationPlugin : public QGenericPlugin
{
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface")
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "meego.json")
public:
QMeeGoIntegrationPlugin();
diff --git a/src/plugins/generic/meego/meego.json b/src/plugins/generic/meego/meego.json
new file mode 100644
index 0000000000..b475b67f25
--- /dev/null
+++ b/src/plugins/generic/meego/meego.json
@@ -0,0 +1,3 @@
+{
+ "Keys": [ "MeeGoIntegration" ]
+}