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

[Florian Boucault]

OrientationHelper: report the current orientation of the application via QWindow::contentOrientation.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:648
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/397/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1502/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/254/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/254/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1506/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/report_content_orientation]

649. By Florian Boucault on 2013-07-24

Fix CI failure.

[Florian Boucault (fboucault)]

Extra qDebug statement will have to be removed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:649
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/398/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1504/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1508/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/report_content_orientation]

650. By Florian Boucault on 2013-07-24

Merged lp:~juhapekka-piiroinen/ubuntu-ui-toolkit/fix-pep8-issues

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:650
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/399/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1507/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/256/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/256/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1511/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/report_content_orientation]

651. By Florian Boucault on 2013-07-25

Empty commit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:651
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/409/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/266
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1537
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1537/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1298

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

review: Needs Fixing (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

I sometimes get crashes in UbuntuComponentsPlugin::setWindowContextProperty because m_context does not seem to be constructed yet. I suggest adding an explicit constructor that initializes m_context to 0, to have it in a defined state until initializeEngine() is called.

[Florian Boucault (fboucault)]

> I sometimes get crashes in UbuntuComponentsPlugin::setWindowContextProperty
> because m_context does not seem to be constructed yet. I suggest adding an
> explicit constructor that initializes m_context to 0, to have it in a defined
> state until initializeEngine() is called.

Can you provide the stacktrace of the crash you are getting?

[Thomas Moenicke (thomas-moenicke)]

After doing some more investigation, I can verify the m_context object gets instantiated correctly before setWindowContextProperty() is called. The issue is only for the maliit-server itself when showing up, the context object is invalid or dangled. This fixes it for me:
https://code.launchpad.net/~thomas-moenicke/phablet-extras/ubuntu-sdk-report-content-orientation

[lp:~fboucault/ubuntu-ui-toolkit/report_content_orientation]

652. By Florian Boucault on 2013-07-26

Fix segmentation fault.

653. By Florian Boucault on 2013-07-26

Removed debugging.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2013-07-09 15:42:50 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2013-07-26 11:39:31 +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-10 12:27:23 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2013-07-26 11:39:31 +0000
@@ -100,6 +100,26 @@
     }
 }
 
+void UbuntuComponentsPlugin::registerWindowContextProperty()
+{
+    setWindowContextProperty(QGuiApplication::focusWindow());
+
+    // listen to QGuiApplication::focusWindowChanged
+    QGuiApplication* application = static_cast<QGuiApplication*>(QCoreApplication::instance());
+    QObject::connect(application, SIGNAL(focusWindowChanged(QWindow*)),
+                     this, SLOT(setWindowContextProperty(QWindow*)));
+
+}
+
+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 +184,6 @@
             Qt::LandscapeOrientation |
             Qt::InvertedPortraitOrientation |
             Qt::InvertedLandscapeOrientation);
+
+    registerWindowContextProperty();
 }

=== modified file 'modules/Ubuntu/Components/plugin/plugin.h'
--- modules/Ubuntu/Components/plugin/plugin.h	2013-07-01 05:54:33 +0000
+++ modules/Ubuntu/Components/plugin/plugin.h	2013-07-26 11:39:31 +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