Merge lp:~dandrader/qtubuntu/noQtSensors-lp1481389 into lp:qtubuntu

[Daniel d'Andrada]

Remove QtSensors dependency

The only thing the Mir plugin used from QtSensors was the enum
QOrientationReading::Orientation.

Pulling the fix from https://codereview.qt-project.org/#/c/122798/

[Daniel d'Andrada (dandrader)]

Approving as this code is not mine and I reviewed and tested it

review: Approve

[Gerry Boland (gerboland)]

Please remove libqt5sensors5-dev from debian/control

Also is qtdeclarative5-dev needed?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:272
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/233/rebuild

review: Approve (continuous-integration)

[lp:~dandrader/qtubuntu/noQtSensors-lp1481389]

273. By Daniel d'Andrada on 2015-08-06

Remove unneeded dependencies from debian/control and ancient manual tests

[Daniel d'Andrada (dandrader)]

> Please remove libqt5sensors5-dev from debian/control
>
> Also is qtdeclarative5-dev needed?

Well spotted. Removed them all

[Gerry Boland (gerboland)]

Minor nitpick:
debian/copyright - remove reference to tests dir.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:273
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/234/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/234/rebuild

review: Approve (continuous-integration)

[lp:~dandrader/qtubuntu/noQtSensors-lp1481389]

274. By Daniel d'Andrada on 2015-08-06

Update debian/copyright

[Daniel d'Andrada (dandrader)]

On 06/08/15 13:44, Gerry Boland wrote:
> Minor nitpick:
> debian/copyright - remove reference to tests dir.
Done.

[Gerry Boland (gerboland)]

+QT += core-private gui-private ....
We don't need gui-private either

review: Needs Fixing

[lp:~dandrader/qtubuntu/noQtSensors-lp1481389]

275. By Daniel d'Andrada on 2015-08-06

We don't need gui-private either

[Daniel d'Andrada (dandrader)]

On 06/08/15 14:07, Gerry Boland wrote:
> Review: Needs Fixing
>
> +QT += core-private gui-private ....
> We don't need gui-private either
Done.

[Gerry Boland (gerboland)]

LGTM!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/235/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/26/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/235/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-06-23 18:02:16 +0000
+++ debian/control	2015-08-06 17:11:31 +0000
@@ -16,8 +16,6 @@
                libxkbcommon-dev,
                qt5-default,
                qtbase5-private-dev,
-               qtdeclarative5-dev,
-               libqt5sensors5-dev,
                libmirclient-dev (>= 0.13.0),
 # if you don't have have commit access to this branch but would like to upload
 # directly to Ubuntu, don't worry: your changes will be merged back into the
@@ -39,8 +37,6 @@
 Provides: qtubuntu,
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libqt5sensors5,
-         qtubuntu-sensors,
          ubuntu-application-api3-touch,
 Description: Qt plugins for Ubuntu Platform API (mobile)
  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
@@ -62,8 +58,6 @@
 Provides: qtubuntu,
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libqt5sensors5,
-         qtubuntu-sensors,
          ubuntu-application-api3-desktop,
 Description: Qt plugins for Ubuntu Platform API (desktop)
  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a

=== modified file 'debian/copyright'
--- debian/copyright	2014-06-30 11:09:14 +0000
+++ debian/copyright	2015-08-06 17:11:31 +0000
@@ -9,10 +9,6 @@
 Copyright: 2014 Canonical Ltd.
 License: GPL-3
 
-Files: tests/*
-Copyright: 2013 Canonical Ltd.
-License: GPL-3
-
 License: LGPL-3
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -29,7 +25,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  .
  On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-3'. 
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
 
 License: GPL-3
  This program is free software: you can redistribute it and/or modify

=== modified file 'qtubuntu.pro'
--- qtubuntu.pro	2014-06-20 11:34:53 +0000
+++ qtubuntu.pro	2015-08-06 17:11:31 +0000
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += src tests
+SUBDIRS += src

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2015-06-17 13:46:49 +0000
+++ src/ubuntumirclient/input.cpp	2015-08-06 17:11:31 +0000
@@ -470,19 +470,19 @@
         return;
     }
 
-    QOrientationReading::Orientation orientation;
+    OrientationChangeEvent::Orientation orientation;
     switch (mir_orientation) {
     case mir_orientation_normal:
-        orientation = QOrientationReading::TopUp;
+        orientation = OrientationChangeEvent::TopUp;
         break;
     case mir_orientation_left:
-        orientation = QOrientationReading::LeftUp;
+        orientation = OrientationChangeEvent::LeftUp;
         break;
     case mir_orientation_inverted:
-        orientation = QOrientationReading::TopDown;
+        orientation = OrientationChangeEvent::TopDown;
         break;
     case mir_orientation_right:
-        orientation = QOrientationReading::RightUp;
+        orientation = OrientationChangeEvent::RightUp;
         break;
     default:
         DLOG("No such orientation %d", mir_orientation);

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2015-06-23 22:19:27 +0000
+++ src/ubuntumirclient/integration.cpp	2015-08-06 17:11:31 +0000
@@ -55,7 +55,12 @@
     Q_UNUSED(archive)
     DASSERT(context != NULL);
     UbuntuClientIntegration* integration = static_cast<UbuntuClientIntegration*>(context);
-    integration->inputContext()->hideInputPanel();
+    QPlatformInputContext *inputContext = integration->inputContext();
+    if (inputContext) {
+        inputContext->hideInputPanel();
+    } else {
+        qWarning("UbuntuClientIntegration aboutToStopCallback(): no input context");
+    }
     QCoreApplication::postEvent(QCoreApplication::instance(),
                                 new QEvent(QEvent::ApplicationDeactivate));
 }

=== modified file 'src/ubuntumirclient/orientationchangeevent_p.h'
--- src/ubuntumirclient/orientationchangeevent_p.h	2014-09-02 10:34:47 +0000
+++ src/ubuntumirclient/orientationchangeevent_p.h	2015-08-06 17:11:31 +0000
@@ -18,19 +18,20 @@
 #define ORIENTATIONCHANGEEVENT_P_H
 
 #include <QEvent>
-#include <QOrientationReading>
 #include "logging.h"
 
 class OrientationChangeEvent : public QEvent {
 public:
-    OrientationChangeEvent(QEvent::Type type, QOrientationReading::Orientation orientation)
+    enum Orientation { TopUp, LeftUp, TopDown, RightUp };
+
+    OrientationChangeEvent(QEvent::Type type, Orientation orientation)
         : QEvent(type)
         , mOrientation(orientation)
     {
     }
 
     static const QEvent::Type mType;
-    QOrientationReading::Orientation mOrientation;
+    Orientation mOrientation;
 };
 
 #endif // ORIENTATIONCHANGEEVENT_P_H

=== modified file 'src/ubuntumirclient/screen.cpp'
--- src/ubuntumirclient/screen.cpp	2015-06-24 17:21:21 +0000
+++ src/ubuntumirclient/screen.cpp	2015-08-06 17:11:31 +0000
@@ -210,22 +210,22 @@
 
     OrientationChangeEvent* oReadingEvent = static_cast<OrientationChangeEvent*>(event);
     switch (oReadingEvent->mOrientation) {
-        case QOrientationReading::LeftUp: {
+        case OrientationChangeEvent::LeftUp: {
             mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::InvertedPortraitOrientation : Qt::LandscapeOrientation;
             break;
         }
-        case QOrientationReading::TopUp: {
+        case OrientationChangeEvent::TopUp: {
             mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::LandscapeOrientation : Qt::PortraitOrientation;
             break;
         }
-        case QOrientationReading::RightUp: {
+        case OrientationChangeEvent::RightUp: {
             mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::PortraitOrientation : Qt::InvertedLandscapeOrientation;
             break;
         }
-        case QOrientationReading::TopDown: {
+        case OrientationChangeEvent::TopDown: {
             mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::InvertedLandscapeOrientation : Qt::InvertedPortraitOrientation;
             break;

=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
--- src/ubuntumirclient/ubuntumirclient.pro	2015-01-28 17:26:55 +0000
+++ src/ubuntumirclient/ubuntumirclient.pro	2015-08-06 17:11:31 +0000
@@ -2,7 +2,7 @@
 TEMPLATE = lib
 
 QT -= gui
-QT += core-private gui-private platformsupport-private sensors dbus
+QT += core-private platformsupport-private dbus
 
 CONFIG += plugin no_keywords qpa/genericunixfontdatabase
 
@@ -35,7 +35,7 @@
     integration.h \
     logging.h \
     nativeinterface.h \
-    orientationchangeevent_p.h \    
+    orientationchangeevent_p.h \
     platformservices.h \
     plugin.h \
     screen.h \

=== removed directory 'tests'
=== removed file 'tests/Application.qml'
--- tests/Application.qml	2013-09-04 12:01:57 +0000
+++ tests/Application.qml	1970-01-01 00:00:00 +0000
@@ -1,180 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-// That example demonstrates the types added by the Ubuntu application plugin and how to use them.
-//
-// Here is how to create a window with specific surface role (Greeter here) from QML.
-//
-//    import QtQuick.Window 2.0
-//
-//    Window {
-//        width: 400
-//        height: 400
-//        Component.onCompleted: {
-//            window.role = ApplicationManager.Greeter
-//            window.visible = true
-//        }
-//    }
-//
-// Here is how to start a new process:
-//    ApplicationManager.startProcess("snowshoe")
-//
-// In order to pass additional arguments, a second optional argument can be used:
-//    ApplicationManager.startProcess("snowshoe", [ "http://www.ubuntu.com" ])
-//
-// An application can be stopped by using:
-//     ApplicationManager.stopProcess(application)
-//
-// In order to focus or start a favorite application, that function can be used:
-//     ApplicationManager.focusFavoriteApplication(ApplicationManager.GalleryApplication);
-//
-// A good way to use Application.qml is to launch it using:
-//     qmlscene-ubuntu --fullscreen --session 1 --role 0 Application.qml
-// and then to launch other applications using:
-//     qmlscene-ubuntu --session 0 --role 1 MovingLogo.qml \
-//         --desktop_file_hint=/usr/share/applications/goodhope.desktop --stage_hint=main_stage
-
-import QtQuick 2.0
-import Unity.Application 0.1
-
-Rectangle {
-    id: surface
-    width: 2560
-    height: 1600
-    color: "#000020"
-
-    Connections {
-        target: ApplicationManager
-        onFocusRequested: {
-            var favoriteApplicationStr = [
-                'CameraApplication', 'GalleryApplication', 'BrowserApplication', 'ShareApplication'
-            ];
-            print("focus request:", favoriteApplicationStr[favoriteApplication])
-        }
-    }
-
-    MouseArea {
-        id: touchArea
-        anchors.fill: parent
-        onClicked: {
-            // ApplicationManager.focusFavoriteApplication(ApplicationManager.BrowserApplication);
-        }
-    }
-
-    Column {
-        id: mainHeader
-
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        spacing: 10
-
-        Text {
-            font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 40; color: "white"
-            text: "Main stage:"
-        }
-    }
-
-    Row {
-        id: mainRow
-
-        anchors {
-            top: mainHeader.bottom
-            topMargin: 10
-        }
-
-        Repeater {
-            model: ApplicationManager.mainStageApplications
-            delegate: ApplicationImage {
-                id: applicationImage
-                width: 2560 / 5; height: 1600 / 5
-                source: application
-                Text {
-                    font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 30; color: "white"
-                    text: application.name
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: applicationImage.scheduleUpdate()
-                }
-
-                Timer {
-                    running: true
-                    onTriggered: applicationImage.scheduleUpdate()
-                }
-            }
-        }
-    }
-
-    Column {
-        id: sideHeader
-        y: surface.height / 2
-
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        spacing: 10
-
-        Text {
-            font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 40; color: "white"
-            text: "Side stage:"
-        }
-    }
-
-    Row {
-        anchors {
-            top: sideHeader.bottom
-            topMargin: 10
-        }
-
-        Repeater {
-            model: ApplicationManager.sideStageApplications
-            delegate: ApplicationImage {
-                id: applicationImage
-                width: 2560 / 5; height: 1600 / 5
-                source: application
-                Text {
-                    font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 30; color: "white"
-                    text: application.name
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: applicationImage.scheduleUpdate()
-                }
-
-                Timer {
-                    running: true
-                    onTriggered: applicationImage.scheduleUpdate()
-                }
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        // Display form factor and stage hints.
-        var formFactorHintStr = [
-            'Desktop', 'Phone', 'Tablet'
-        ];
-        var stageHintStr = [
-            'Main', 'Integration', 'Share', 'ContentPicking', 'Side', 'Configuration'
-        ];
-        print('Form factor hint:', formFactorHintStr[ApplicationManager.formFactorHint]);
-        print('Stage hint:', stageHintStr[ApplicationManager.stageHint]);
-    }
-}

=== removed file 'tests/Fullscreen.qml'
--- tests/Fullscreen.qml	2013-09-04 12:01:57 +0000
+++ tests/Fullscreen.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-// Non graphical test watching fullscreen states of main and side stages.
-
-import QtQuick 2.0
-import Unity.Application 0.1
-
-Item {
-    Timer {
-        id: time
-        interval: 1000
-        repeat: true
-        onTriggered: {
-            if (ApplicationManager.mainStageFocusedApplication) {
-                print(ApplicationManager.sideStageFocusedApplication.name,
-                      "in main stage is fullscreen: ",
-                      ApplicationManager.sideStageFocusedApplication.fullscreen)
-            }
-            if (ApplicationManager.sideStageFocusedApplication) {
-                print(ApplicationManager.sideStageFocusedApplication.name,
-                      "in side stage is fullscreen: ",
-                      ApplicationManager.sideStageFocusedApplication.fullscreen)
-            }
-        }
-        Component.onCompleted: time.start()
-    }
-    Component.onCompleted: {
-        time.start()
-    }
-}

=== removed file 'tests/Input.qml'
--- tests/Input.qml	2013-02-14 16:31:33 +0000
+++ tests/Input.qml	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import QtQuick 2.0
-
-Item {
-    id: surface
-
-    // Hard-coded Samsung Galaxy Nexus screen size.
-    width: 720
-    height: 1280
-
-    // Needed for the key events to be emitted.
-    focus: true
-
-    MultiPointTouchArea {
-        anchors.fill: parent
-        touchPoints: [
-            TouchPoint { id: point1 }, TouchPoint { id: point2 }, TouchPoint { id: point3 },
-            TouchPoint { id: point4 }, TouchPoint { id: point5 }
-        ]
-    }
-
-    // Touch elements.
-    Text {
-        font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 100; color: "#9F9F00"
-        x: point5.x + 50; y: point5.y - 200
-        visible: point5.pressed
-        text: "5"
-    }
-    Text {
-        font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 100; color: "#AF00AF"
-        x: point4.x + 50; y: point4.y - 200
-        visible: point4.pressed
-        text: "4"
-    }
-    Text {
-        font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 100; color: "#0000EF"
-        x: point3.x + 50; y: point3.y - 200
-        visible: point3.pressed
-        text: "3"
-    }
-    Text {
-        font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 100; color: "#00FF00"
-        x: point2.x + 50; y: point2.y - 200
-        visible: point2.pressed
-        text: "2"
-    }
-    Text {
-        font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 100; color: "#FF0000"
-        x: point1.x + 50; y: point1.y - 200
-        visible: point1.pressed
-        text: "1"
-    }
-
-    // Key elements.
-    Text {
-        id: keyText
-        font.family: "Ubuntu Mono"; font.weight: Font.Bold; font.pixelSize: 75; color: "#DFDFDF"
-        anchors.centerIn: surface
-        visible: false
-        text: ""
-    }
-    Keys.onPressed: {
-        if (event.key == Qt.Key_PowerOff)
-            keyText.text = "Power Off";
-        else if (event.key == Qt.Key_VolumeUp)
-            keyText.text = "Volume Up";
-        else if (event.key == Qt.Key_VolumeDown)
-            keyText.text = "Volume Down";
-        keyText.visible = true;
-    }
-    Keys.onReleased: {
-        keyText.visible = false;
-    }
-}

=== removed file 'tests/InputFilter.qml'
--- tests/InputFilter.qml	2013-09-04 12:01:57 +0000
+++ tests/InputFilter.qml	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import QtQuick 2.0
-import Unity.Application 0.1
-
-Item {
-    width: 700; height: 700
-
-    InputFilterArea {
-        id: topLeftFilter
-        width: 500
-        height: 500
-        blockInput: true
-
-        Rectangle {
-            anchors.fill: parent
-            color: parent.blockInput ? "red" : "green"
-            opacity: parent.blockInput ? 1.0 : 0.8
-        }
-    }
-
-    MouseArea {
-        anchors.centerIn: parent
-        width: 500
-        height: 200
-        onClicked: {
-            topLeftFilter.blockInput = !topLeftFilter.blockInput;
-            bottomRightFilter.blockInput = !bottomRightFilter.blockInput;
-        }
-
-        Rectangle {
-            anchors.fill: parent
-            color: "grey"
-        }
-
-        Text {
-            anchors.centerIn: parent
-            text: "Press to toggle filters"
-            font.pixelSize: 45
-            color: "lightgrey"
-        }
-    }
-
-    InputFilterArea {
-        id: bottomRightFilter
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        width: 500
-        height: 500
-        blockInput: true
-
-        Rectangle {
-            anchors.fill: parent
-            color: parent.blockInput ? "red" : "green"
-            opacity: parent.blockInput ? 1.0 : 0.8
-        }
-    }
-}

=== removed file 'tests/Logo.qml'
--- tests/Logo.qml	2013-02-14 16:31:33 +0000
+++ tests/Logo.qml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import QtQuick 2.0
-
-Item {
-    width: 720; height: 1280
-    Image { anchors.fill: parent; source: "logo.png" }
-}

=== removed file 'tests/MovingLogo.qml'
--- tests/MovingLogo.qml	2013-02-14 16:31:33 +0000
+++ tests/MovingLogo.qml	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import QtQuick 2.0
-
-Item {
-    id: surface
-
-    // Hard-coded Samsung Galaxy Nexus screen size.
-    width: 720
-    height: 1280
-
-    property real seed
-
-    function lerp(x, a, b) {
-        return ((1.0 - x) * a) + (x * b);
-    }
-
-    Item {
-        id: scene
-        anchors.fill: parent
-
-        Image {
-            id: logo
-            source: "logo.png"
-
-            SequentialAnimation on y {
-                loops: Animation.Infinite
-                NumberAnimation {
-                    from: 0.0; to: surface.height - logo.height
-                    duration: Math.floor(lerp(Math.random(surface.seed), 2250.0, 2750.0))
-                    easing.type: Easing.InOutSine;
-                }
-                NumberAnimation {
-                    to: 0.0; from: surface.height - logo.height
-                    duration: Math.floor(lerp(Math.random(surface.seed), 2250.0, 2750.0))
-                    easing.type: Easing.InOutSine;
-                }
-            }
-
-            SequentialAnimation on x {
-                loops: Animation.Infinite
-                NumberAnimation {
-                    from: 0.0; to: surface.width - logo.width
-                    duration: Math.floor(lerp(Math.random(surface.seed), 1750.0, 2250.0))
-                    easing.type: Easing.InOutSine;
-                }
-                NumberAnimation {
-                    to: 0.0; from: surface.width - logo.width
-                    duration: Math.floor(lerp(Math.random(surface.seed), 1750.0, 2250.0))
-                    easing.type: Easing.InOutSine;
-                }
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        var d = new Date();
-        surface.seed = d.getSeconds();
-    }
-}

=== removed file 'tests/TextInput.qml'
--- tests/TextInput.qml	2014-09-17 06:12:22 +0000
+++ tests/TextInput.qml	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2014 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import QtQuick 2.0
-
-Item {
-    width: 700
-    height: 700
-
-    Rectangle {
-        width: 700
-        height: 25
-        TextInput {
-            anchors {
-                fill: parent
-                margins: 5
-            }
-            focus: true
-            echoMode: TextInput.Password
-        }
-    }
-}

=== removed file 'tests/WarpingLogo.qml'
--- tests/WarpingLogo.qml	2013-02-14 16:31:33 +0000
+++ tests/WarpingLogo.qml	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import QtQuick 2.0
-
-Item {
-    id: surface
-
-    // Hard-coded Samsung Galaxy Nexus screen size.
-    width: 720
-    height: 1280
-
-    property real displace
-    SequentialAnimation on displace {
-        loops: Animation.Infinite
-        NumberAnimation { from: 0.0; to: 1.0; duration: 30000 }
-    }
-
-    Item {
-        id: scene
-        anchors.fill: parent
-        Image {
-            id: logo
-            x: (scene.width - sourceSize.width) / 2
-            y: (scene.height - sourceSize.height) / 2
-            width: sourceSize.width
-            height: sourceSize.height
-            source: "logo.png"
-            sourceSize: Qt.size(400, 400)
-        }
-    }
-
-    ShaderEffect {
-        property variant tex: ShaderEffectSource {
-            sourceItem: scene; hideSource: true; live: false; smooth: true
-        }
-        property variant noise: ShaderEffectSource {
-            sourceItem: Image { source: "noise.png"; smooth: true }
-            wrapMode: ShaderEffectSource.Repeat
-        }
-        property variant size: Qt.size(scene.width, scene.height)
-        property variant displace: surface.displace
-
-        anchors.fill: parent
-        blending: false
-
-        vertexShader: "
-            uniform mediump float displace;
-            uniform mediump vec2 size;
-            uniform mediump mat4 qt_Matrix;
-            attribute mediump vec4 qt_Vertex;
-            attribute mediump vec2 qt_MultiTexCoord0;
-            varying mediump vec2 texCoord;
-            varying mediump vec2 noiseCoord;
-            void main() {
-                texCoord = qt_MultiTexCoord0.xy;
-                noiseCoord = vec2(qt_MultiTexCoord0.x * 0.25,
-                                  qt_MultiTexCoord0.y * 0.25 + displace);
-                gl_Position = qt_Matrix * qt_Vertex;
-            }"
-
-        fragmentShader: "
-            uniform sampler2D noise;
-            uniform sampler2D tex;
-            varying mediump vec2 texCoord;
-            varying mediump vec2 noiseCoord;
-            void main() {
-                mediump vec2 noiseVec = texture2D(noise, noiseCoord).xy;
-                gl_FragColor = texture2D(tex, texCoord + ((noiseVec - 0.5) * 0.05));
-            }"
-    }
-}

=== removed directory 'tests/clipboard'
=== removed file 'tests/clipboard/clipboard.cc'
--- tests/clipboard/clipboard.cc	2013-02-05 14:42:15 +0000
+++ tests/clipboard/clipboard.cc	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include <QtGui/QGuiApplication>
-#include <QtGui/QClipboard>
-#include <cstdio>
-
-enum Operation { kNone, kCopy, kPaste };
-
-static void usage() {
-  fprintf(stdout,
-          "Usage: clipboard [options]\n\n"
-          "  Options:\n"
-          "    -c or --copy \"text\"     ... Copy text to clipboard\n"
-          "    -p or --paste           ... Paste text from clipboard\n"
-          "    -h or --help            ... Show that help\n");
-}
-
-int main(int argc, char* argv[]) {
-  Operation operation = kNone;
-  QString text;
-
-  for (int i = 1; i < argc; ++i) {
-    const QString kArg = QString::fromLatin1(argv[i]).toLower();
-    if ((kArg == QLatin1String("-c") || kArg == QLatin1String("--copy")) && i + 1 < argc) {
-      operation = kCopy;
-      text = QString::fromLatin1(argv[++i]);
-    } else if (kArg == QLatin1String("-p") || kArg == QLatin1String("--paste")) {
-      operation = kPaste;
-    } else if (kArg == QLatin1String("-h") || kArg == QLatin1String("--help")) {
-      usage();
-      return 1;
-    }
-  }
-  if (operation == kNone) {
-    usage();
-    return 1;
-  }
-
-  QGuiApplication app(argc, argv);
-  if (operation == kCopy) {
-    QGuiApplication::clipboard()->setText(text);
-    fprintf(stdout, "Copied: \"%s\"\n", text.toLatin1().data());
-  } else {
-    fprintf(stdout, "Pasted: \"%s\"\n", QGuiApplication::clipboard()->text().toLatin1().data());
-  }
-
-  return 0;
-}

=== removed file 'tests/clipboard/clipboard.pro'
--- tests/clipboard/clipboard.pro	2013-02-05 14:42:15 +0000
+++ tests/clipboard/clipboard.pro	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-QT += core gui
-
-TARGET = clipboard
-TEMPLATE = app
-
-SOURCES += clipboard.cc
-LIBS += -lrt

=== removed file 'tests/logo.png'
Binary files tests/logo.png	2012-09-27 18:17:22 +0000 and tests/logo.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tests/noise.png'
Binary files tests/noise.png	2012-09-27 22:15:46 +0000 and tests/noise.png	1970-01-01 00:00:00 +0000 differ
=== removed directory 'tests/qmlscene_ubuntu'
=== removed file 'tests/qmlscene_ubuntu/qmlscene_ubuntu.cc'
--- tests/qmlscene_ubuntu/qmlscene_ubuntu.cc	2013-11-25 09:31:28 +0000
+++ tests/qmlscene_ubuntu/qmlscene_ubuntu.cc	1970-01-01 00:00:00 +0000
@@ -1,178 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "qmlscene_ubuntu.h"
-#include <QtCore/QFileInfo>
-#include <QtGui/QGuiApplication>
-#include <QtQuick/QQuickView>
-#include <QtQml/qqmlengine.h>
-#include <qpa/qplatformnativeinterface.h>
-#include <cstdio>
-#include <ctime>
-#include <csignal>
-#include <cfloat>
-
-Scene::Scene(QObject* parent)
-    : QObject(parent)
-    , frames_(0)
-    , sum_(0.0)
-    , min_(DBL_MAX)
-    , max_(0.0) {
-}
-
-void Scene::beforeRendering() {
-  clock_gettime(CLOCK_MONOTONIC, &t1_);
-}
-
-void Scene::afterRendering() {
-  clock_gettime(CLOCK_MONOTONIC, &t2_);
-  double time = ((t2_.tv_sec * 1000000000 + t2_.tv_nsec) -
-                 (t1_.tv_sec * 1000000000 + t1_.tv_nsec)) / 1000000.0;
-  if (time < min_)
-    min_ = time;
-  if (time > max_)
-    max_ = time;
-  sum_ += time;
-  frames_++;
-}
-
-void Scene::getStats(int* frames, double* min, double* max, double* average) {
-  *frames = frames_;
-  *min = min_;
-  *max = max_;
-  *average = sum_ / frames_;
-}
-
-static void usage() {
-  fprintf(stdout,
-          "Usage: qmlscene-ubuntu [options] <filename>\n\n"
-          "  Options:\n"
-          "    -i <path>                  ... Add <path> to the list of import paths\n"
-          "    -f or --fullscreen         ... Show the window fullscreen\n"
-          "    -m or --maximized          ... Show the window maximized\n"
-          "    -s or --session <session>  ... Set the Ubuntu session type\n"
-          "    -r or --role <role>        ... Set the Ubuntu surface role\n"
-          "    -o or --opaque             ... Set the Ubuntu opaque surface flag\n"
-          "    -h or --help               ... Show that help\n");
-}
-
-// static void logger(QtMsgType type, const char* msg) {
-//   Q_UNUSED(type);
-//   Q_UNUSED(msg);
-// }
-
-static void signalHandler(int signal) {
-  switch (signal) {
-    case SIGINT:
-    case SIGTERM: {
-      QGuiApplication::quit();
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-}
-
-int main(int argc, char* argv[]) {
-  QQuickView* view;
-  int exit_code;
-  QUrl url;
-  QStringList imports;
-  bool fullscreen = false;
-  bool maximized = false;
-  int session = 0;
-  int role = 1;
-  int opaque = 0;
-
-  for (int i = 1; i < argc; ++i) {
-    if (QFileInfo(QFile::decodeName(argv[i])).exists()) {
-      url = QUrl::fromLocalFile(argv[i]);
-    } else {
-      const QString kArg = QString::fromLatin1(argv[i]).toLower();
-      if (kArg == QLatin1String("-i") && i + 1 < argc) {
-        imports.append(QString::fromLatin1(argv[++i]));
-      } else if (kArg == QLatin1String("-f") || kArg == QLatin1String("--fullscreen")) {
-        fullscreen = true;
-      } else if (kArg == QLatin1String("-m") || kArg == QLatin1String("--maximized")) {
-        maximized = true;
-      } else if ((kArg == QLatin1String("-s") || kArg == QLatin1String("--session"))
-                 && i + 1 < argc) {
-        session = atoi(argv[++i]);
-      } else if ((kArg == QLatin1String("-r") || kArg == QLatin1String("--role"))
-                 && i + 1 < argc) {
-        role = atoi(argv[++i]);
-      } else if ((kArg == QLatin1String("-o") || kArg == QLatin1String("--opaque"))
-                 && i + 1 < argc) {
-        opaque = atoi(argv[++i]);
-      } else if (kArg == QLatin1String("-h") || kArg == QLatin1String("--help")) {
-        usage();
-        return 0;
-      }
-    }
-  }
-  if (url.isEmpty()) {
-    usage();
-    return 1;
-  }
-
-  // Swallow all the messages to avoid cluttering the standard output.
-  // qInstallMsgHandler(logger);
-
-  signal(SIGINT, signalHandler);
-  signal(SIGTERM, signalHandler);
-
-  QGuiApplication app(argc, argv);
-  app.setApplicationName("QmlSceneUbuntu");
-  app.setOrganizationName("Canonical");
-  app.setOrganizationDomain("canonical.com");
-
-  view = new QQuickView();
-
-  QPlatformNativeInterface* native = QGuiApplication::platformNativeInterface();
-  native->setProperty("session", session);
-  view->setProperty("role", role);
-  view->setProperty("opaque", opaque);
-
-  QQmlEngine* engine = view->engine();
-  for (int i = 0; i < imports.size(); ++i)
-    engine->addImportPath(imports.at(i));
-
-  view->setColor(Qt::transparent);
-  view->setTitle("QML Scene Ubuntu");
-  view->setResizeMode(QQuickView::SizeRootObjectToView);
-  view->setSource(url);
-  if (fullscreen)
-    view->showFullScreen();
-  else if (maximized)
-    view->showMaximized();
-  else
-    view->show();
-
-  Scene scene;
-  QObject::connect(view, SIGNAL(beforeRendering()), &scene, SLOT(beforeRendering()));
-  QObject::connect(view, SIGNAL(afterRendering()), &scene, SLOT(afterRendering()));
-
-  exit_code = app.exec();
-  delete view;
-
-  int frames;
-  double min, max, average;
-  scene.getStats(&frames, &min, &max, &average);
-  fprintf(stdout, "Over %d frames\nmin: %.2lf ms\nmax: %.2lf ms\navg: %.2lf ms\n",
-          frames, min, max, average);
-
-  return exit_code;
-}

=== removed file 'tests/qmlscene_ubuntu/qmlscene_ubuntu.h'
--- tests/qmlscene_ubuntu/qmlscene_ubuntu.h	2013-02-14 16:31:33 +0000
+++ tests/qmlscene_ubuntu/qmlscene_ubuntu.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 3, as published by the
-// Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include <QObject>
-
-class Scene : public QObject {
-  Q_OBJECT
-
- public:
-  Scene(QObject* parent = 0);
-  void getStats(int* frames, double* min, double* max, double* average);
-
- private slots:
-  void beforeRendering();
-  void afterRendering();
-
- private:
-  struct timespec t1_;
-  struct timespec t2_;
-  qint64 frames_;
-  double sum_;
-  double min_;
-  double max_;
-};

=== removed file 'tests/qmlscene_ubuntu/qmlscene_ubuntu.pro'
--- tests/qmlscene_ubuntu/qmlscene_ubuntu.pro	2013-06-13 18:07:55 +0000
+++ tests/qmlscene_ubuntu/qmlscene_ubuntu.pro	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-QT += core quick qml gui-private
-
-TARGET = qmlscene-ubuntu
-TEMPLATE = app
-
-HEADERS += qmlscene_ubuntu.h
-SOURCES += qmlscene_ubuntu.cc
-
-LIBS += -lrt
-
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtubuntu
-sources.files = $$HEADERS $$SOURCES qmlscene_ubuntu.pro

=== removed file 'tests/tests.pro'
--- tests/tests.pro	2013-02-05 02:05:42 +0000
+++ tests/tests.pro	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += qmlscene_ubuntu clipboard
-
-OTHER_FILES += *.qml logo.png noise.png
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtubuntu
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtubuntu
-sources.files = $$OTHER_FILES tests.pro
-INSTALLS += target