Merge lp:~fboucault/ubuntu-ui-toolkit/content_orientation_bis into lp:ubuntu-ui-toolkit

[Florian Boucault]

OrientationHelper: report the current orientation of the application via QWindow::contentOrientation.
This is a remerge of a previous merge that was reverted because of a segfault. The segfault has been fixed by ensuring that setWindowContextProperty is called in the same thread (the main thread).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:664
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/427/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1652
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/284
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/284/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1656
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1656/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1401

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/427/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2013-07-27 12:11:45 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2013-07-29 11:41:22 +0000
@@ -91,6 +91,14 @@
 
     Component.onCompleted: orientationTransition.enabled = transitionEnabled
 
+    /*!
+      \internal
+
+      Report the current orientation of the application via QWindow::contentOrientation.
+      http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop
+     */
+    onOrientationAngleChanged: window.contentOrientation = Screen.orientation
+
     Item {
         id: stateWrapper
 
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2013-07-27 12:11:45 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2013-07-29 11:41:22 +0000
@@ -100,6 +100,31 @@
     }
 }
 
+void UbuntuComponentsPlugin::registerWindowContextProperty()
+{
+    setWindowContextProperty(QGuiApplication::focusWindow());
+
+    // listen to QGuiApplication::focusWindowChanged
+    /* Ensure that setWindowContextProperty is called in the same thread (the
+       main thread) otherwise it segfaults. Reference:
+       https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205556
+    */
+    QGuiApplication* application = static_cast<QGuiApplication*>(QCoreApplication::instance());
+    QObject::connect(application, SIGNAL(focusWindowChanged(QWindow*)),
+                     this, SLOT(setWindowContextProperty(QWindow*)),
+                     Qt::DirectConnection);
+
+}
+
+void UbuntuComponentsPlugin::setWindowContextProperty(QWindow* focusWindow)
+{
+    QQuickView* view = qobject_cast<QQuickView*>(focusWindow);
+
+    if (view != NULL) {
+        view->rootContext()->setContextProperty("window", view);
+    }
+}
+
 void UbuntuComponentsPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.Components"));
@@ -164,4 +189,6 @@
             Qt::LandscapeOrientation |
             Qt::InvertedPortraitOrientation |
             Qt::InvertedLandscapeOrientation);
+
+    registerWindowContextProperty();
 }
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.h'
--- modules/Ubuntu/Components/plugin/plugin.h	2013-07-27 12:11:45 +0000
+++ modules/Ubuntu/Components/plugin/plugin.h	2013-07-29 11:41:22 +0000
@@ -22,6 +22,8 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
+class QWindow;
+
 class UbuntuComponentsPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
@@ -32,6 +34,10 @@
     void initializeEngine(QQmlEngine *engine, const char *uri);
     QUrl baseUrl(QStringList importPathList, const char* uri);
     void registerQmlSingletonType(QQmlEngine *engine, const char* uri, const char* typeName, const char* qmlFile);
+
+private Q_SLOTS:
+    void registerWindowContextProperty();
+    void setWindowContextProperty(QWindow* focusWindow);
 };
 #endif // UBUNTU_COMPONENTS_PLUGIN_H