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

[Florian Boucault]

Reverted revision 658 introducing reporting of content orientation. Was causing crashes on x86.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:660
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/424/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/281
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/281/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1634
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1634/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1380

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

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2013-07-24 18:16:10 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2013-07-27 12:15:31 +0000
@@ -91,14 +91,6 @@
 
     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-26 11:33:12 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2013-07-27 12:15:31 +0000
@@ -100,26 +100,6 @@
     }
 }
 
-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"));
@@ -184,6 +164,4 @@
             Qt::LandscapeOrientation |
             Qt::InvertedPortraitOrientation |
             Qt::InvertedLandscapeOrientation);
-
-    registerWindowContextProperty();
 }
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.h'
--- modules/Ubuntu/Components/plugin/plugin.h	2013-07-26 11:32:55 +0000
+++ modules/Ubuntu/Components/plugin/plugin.h	2013-07-27 12:15:31 +0000
@@ -22,8 +22,6 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
-class QWindow;
-
 class UbuntuComponentsPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
@@ -34,10 +32,6 @@
     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