Merge lp:~zsombi/ubuntu-ui-toolkit/staging-rollback-1350 into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Rollback to revision 1350.

=== modified file 'components.api'
--- components.api	2014-11-28 08:19:13 +0000
+++ components.api	2014-12-03 06:01:02 +0000
@@ -912,18 +912,6 @@
     Property { name: "source"; type: "QUrl" }
     Signal { name: "extendedSourceChanged" }
     Signal { name: "extendedSourceChanged" }
-    name: "UCServiceProperties"
-    prototype: "QObject"
-    exports: ["ServiceProperties 1.1"]
-    name: "ServiceType"
-    name: "Status"
-    Property { name: "type"; revision: 1; type: "ServiceType" }
-    Property { name: "service"; revision: 1; type: "string" }
-    Property { name: "path"; revision: 1; type: "string" }
-    Property { name: "serviceInterface"; revision: 1; type: "string" }
-    Property { name: "adaptorInterface"; revision: 1; type: "string" }
-    Property { name: "error"; revision: 1; type: "string"; isReadonly: true }
-    Property { name: "status"; revision: 1; type: "Status"; isReadonly: true }
     name: "UCStateSaver"
     prototype: "QObject"
     exports: ["StateSaver 0.1", "StateSaver 1.0"]

=== removed directory 'examples/customtheme'
=== removed file 'examples/customtheme/customtheme.apparmor'
--- examples/customtheme/customtheme.apparmor	2014-11-28 09:06:48 +0000
+++ examples/customtheme/customtheme.apparmor	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-    "policy_groups": [
-        "networking"
-    ],
-    "policy_version": 1.2
-}
-
-

=== removed file 'examples/customtheme/customtheme.desktop'
--- examples/customtheme/customtheme.desktop	2014-11-28 09:06:48 +0000
+++ examples/customtheme/customtheme.desktop	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=customtheme
-Exec=qmlscene $@ main.qml
-Icon=customtheme.png
-Terminal=false
-Type=Application
-X-Ubuntu-Touch=true
-

=== removed file 'examples/customtheme/customtheme.qmlproject'
--- examples/customtheme/customtheme.qmlproject	2014-11-28 09:06:48 +0000
+++ examples/customtheme/customtheme.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-import QmlProject 1.1
-
-Project {
-    mainFile: "main.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    Files {
-        filter: "*.desktop"
-    }
-    Files {
-        filter: "www/*.html"
-    }
-    Files {
-        filter: "Makefile"
-    }
-    Files {
-        filter: "*.apparmor"
-    }
-    Files {
-        directory: "."
-        paths: ["manifest.json",".excludes"]
-    }
-    Files {
-        directory: "www"
-        filter: "*"
-    }
-    Files {
-        directory: "www/img/"
-        filter: "*"
-    }
-    Files {
-        directory: "www/css/"
-        filter: "*"
-    }
-    Files {
-        directory: "www/js/"
-        filter: "*"
-    }
-    Files {
-        directory: "tests/"
-        filter: "*"
-    }
-    Files {
-        directory: "debian"
-        filter: "*"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/bin","/usr/lib/x86_64-linux-gnu/qt5/qml" ]
-}
-

=== removed file 'examples/customtheme/main.qml'
--- examples/customtheme/main.qml	2014-11-28 09:06:48 +0000
+++ examples/customtheme/main.qml	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-/*!
-    \brief MainView with a Label and Button elements.
-*/
-
-MainView {
-    id: mainView
-    // objectName for functional testing purposes (autopilot-qt5)
-    objectName: "mainView"
-
-    // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "customtheme"
-
-    /*
-     This property enables the application to change orientation
-     when the device is rotated. The default is false.
-    */
-    //automaticOrientation: true
-
-    // Removes the old toolbar and enables new features of the new header.
-    useDeprecatedToolbar: false
-
-    width: units.gu(100)
-    height: units.gu(75)
-
-    Component.onCompleted: Theme.name = "theme"
-
-    Page {
-        title: i18n.tr("Theme sample")
-
-        Column {
-            spacing: units.gu(1)
-            anchors {
-                margins: units.gu(2)
-                fill: parent
-            }
-
-            Label {
-                text: i18n.tr("Theme.name:") + " " + Theme.name
-            }
-
-            Button {
-                width: parent.width
-                text: i18n.tr("Light background")
-
-                onClicked: {
-                    mainView.backgroundColor = "white";
-                }
-            }
-            Button {
-                width: parent.width
-                text: i18n.tr("Dark background")
-
-                onClicked: {
-                    mainView.backgroundColor = "blue";
-                }
-            }
-            Button {
-                width: parent.width
-                text: i18n.tr("Set Ambiance theme")
-
-                onClicked: {
-                    Theme.name = "Ubuntu.Components.Themes.Ambiance";
-                }
-            }
-            Button {
-                width: parent.width
-                text: i18n.tr("Set SuruDark theme")
-
-                onClicked: {
-                    Theme.name = "Ubuntu.Components.Themes.SuruDark";
-                }
-            }
-            Button {
-                width: parent.width
-                text: i18n.tr("Application theme")
-
-                onClicked: {
-                    Theme.name = "theme";
-                }
-            }
-        }
-    }
-}
-

=== removed file 'examples/customtheme/manifest.json'
--- examples/customtheme/manifest.json	2014-11-28 09:06:48 +0000
+++ examples/customtheme/manifest.json	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-{
-    "architecture": "all",
-    "description": "description of customtheme",
-    "framework": "ubuntu-sdk-14.10-dev2",
-    "hooks": {
-        "customtheme": {
-            "apparmor": "customtheme.apparmor",
-            "desktop": "customtheme.desktop"
-        }
-    },
-    "maintainer": "Zsombor Egri <[e-mail]>",
-    "name": "customtheme",
-    "title": "customtheme",
-    "version": "0.1"
-}

=== removed directory 'examples/customtheme/theme'
=== removed file 'examples/customtheme/theme/Palette.qml'
--- examples/customtheme/theme/Palette.qml	2014-11-28 09:06:48 +0000
+++ examples/customtheme/theme/Palette.qml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.SuruDark 1.1 as Suru
-
-Suru.Palette {
-    normal.background: "#A21E1C"
-    selected.backgroundText: "lightblue"
-}

=== removed file 'examples/customtheme/theme/parent_theme'
--- examples/customtheme/theme/parent_theme	2014-11-28 09:06:48 +0000
+++ examples/customtheme/theme/parent_theme	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Ubuntu.Components.Themes.SuruDark

=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
--- modules/Ubuntu/Components/AbstractButton.qml	2014-11-28 08:19:13 +0000
+++ modules/Ubuntu/Components/AbstractButton.qml	2014-12-03 06:01:02 +0000
@@ -102,7 +102,7 @@
 
         onClicked: {
             if (button.__acceptEvents) {
-                pressEffect.start();
+                pressEffect.start()
                 button.clicked()
             }
         }

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2014-11-28 09:06:48 +0000
+++ modules/Ubuntu/Components/MainView.qml	2014-12-03 06:01:02 +0000
@@ -205,22 +205,6 @@
         property color headerColor: backgroundColor
         property color backgroundColor: Theme.palette.normal.background
         property color footerColor: backgroundColor
-
-        /*
-          As we don't know the order the property bindings and onXXXChanged signals are evaluated
-          we should rely only on one property when changing the theme to avoid intermediate
-          theme changes due to properties being evaluated separately.
-
-          Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
-          */
-        property string theme: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
-                                   "Ambiance" : "SuruDark"
-        onThemeChanged: {
-            // only change the theme if the current one is a system one.
-            if (theme !== "" && (Theme.name.search("Ubuntu.Components.Themes") >= 0)) {
-                Theme.name = "Ubuntu.Components.Themes.%1".arg(theme);
-            }
-        }
     }
 
     /*!

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-11-28 09:06:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-12-03 06:01:02 +0000
@@ -55,5 +55,22 @@
         id: internals
         property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||
                                   styledItem.backgroundColor != styledItem.footerColor
+        /*
+          As we don't know the order the property bindings and onXXXChanged signals are evaluated
+          we should rely only on one property when changing the theme to avoid intermediate
+          theme changes due to properties being evaluated separately.
+
+          Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
+          */
+        property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" :
+                                (isGradient ? "SuruGradient" : "SuruDark")
+    }
+
+    // automatically select the appropriate theme depending on the background colors
+    Binding {
+        target: Theme
+        property: "name"
+        value: "Ubuntu.Components.Themes.%1".arg(internals.theme)
+        when: internals.theme !== ""
     }
 }

=== removed file 'modules/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.cpp'
--- modules/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.cpp	2014-11-28 08:19:13 +0000
+++ modules/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.cpp	1970-01-01 00:00:00 +0000
@@ -1,226 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "dbuspropertywatcher_p.h"
-#include <QtDBus/QDBusReply>
-#include <unistd.h>
-#include <sys/types.h>
-#include "i18n.h"
-#include <QtQml/QQmlInfo>
-
-#define DYNAMIC_PROPERTY    "__q_property"
-
-UCServicePropertiesPrivate *createServicePropertiesAdapter(UCServiceProperties *owner)
-{
-    return new DBusServiceProperties(owner);
-}
-
-DBusServiceProperties::DBusServiceProperties(UCServiceProperties *qq)
-    : UCServicePropertiesPrivate(qq)
-    , connection("")
-    , watcher(0)
-    , iface(0)
-{
-}
-
-bool DBusServiceProperties::init()
-{
-    // crear previous connections
-    setStatus(UCServiceProperties::Inactive);
-    delete iface;
-    iface = 0;
-    delete watcher;
-    watcher = 0;
-    setError(QString());
-
-    if (service.isEmpty() || path.isEmpty()) {
-        setStatus(UCServiceProperties::ConnectionError);
-        setError(UbuntuI18n::instance().tr("No service/path specified"));
-        return false;
-    }
-
-    switch (type) {
-        case UCServiceProperties::System:
-        {
-            connection = QDBusConnection::systemBus();
-            break;
-        }
-        case UCServiceProperties::Session:
-        {
-            connection = QDBusConnection::sessionBus();
-            break;
-        }
-        default:
-        {
-            setStatus(UCServiceProperties::ConnectionError);
-            setError(UbuntuI18n::instance().tr("Invalid bus type: %1.").arg(type));
-            return false;
-        }
-    }
-
-    Q_Q(UCServiceProperties);
-    // connect dbus watcher to catch OwnerChanged
-    watcher = new QDBusServiceWatcher(service, connection, QDBusServiceWatcher::WatchForOwnerChange, q);
-    // connect interface
-    iface = new QDBusInterface(service, path, interface, connection, q);
-    if (!iface->isValid()) {
-        setStatus(UCServiceProperties::ConnectionError);
-        setError(iface->lastError().message());
-        return false;
-    }
-    // connect watcher to get owner changes
-    QObject::connect(watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-                     this, SLOT(changeServiceOwner(QString,QString,QString)));
-    return setupInterface();
-}
-
-/*
- * Connect dbus signal identified by (service, path, iface, name) quaduple to a
- * slot to receive property changes.
- */
-bool DBusServiceProperties::setupInterface()
-{
-    QDBusReply<QDBusObjectPath> dbusObjectPath = iface->call("FindUserById", qlonglong(getuid()));
-    if (dbusObjectPath.isValid()) {
-        objectPath = dbusObjectPath.value().path();
-        iface->connection().connect(
-            service,
-            objectPath,
-            "org.freedesktop.DBus.Properties",
-            "PropertiesChanged",
-            this,
-            SLOT(updateProperties(QString,QVariantMap,QStringList)));
-        return true;
-    }
-
-    setStatus(UCServiceProperties::ConnectionError);
-    setError(dbusObjectPath.error().message());
-    return false;
-}
-
-bool DBusServiceProperties::fetchPropertyValues()
-{
-    scannedProperties = properties;
-    Q_FOREACH(QString property, properties) {
-        readProperty(property);
-    }
-    return true;
-}
-
-/*
- * Reads a property value from the adaptorInterface asynchronously.
- */
-bool DBusServiceProperties::readProperty(const QString &property)
-{
-    if ((status < UCServiceProperties::Synchronizing) || objectPath.isEmpty()) {
-        return false;
-    }
-    Q_Q(UCServiceProperties);
-    QDBusInterface readIFace(iface->interface(), objectPath, "org.freedesktop.DBus.Properties", connection);
-    if (!readIFace.isValid()) {
-        // report invalid interface only if the property's first letter was with capital one!
-        if (property[0].isUpper()) {
-            qmlInfo(q) << readIFace.lastError().message();
-        }
-        return false;
-    }
-    QDBusPendingCall pending = readIFace.asyncCall("Get", adaptor, property);
-    if (pending.isError()) {
-        qmlInfo(q) << pending.error().message();
-        return false;
-    }
-    QDBusPendingCallWatcher *callWatcher = new QDBusPendingCallWatcher(pending, q);
-    QObject::connect(callWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
-                     this, SLOT(readFinished(QDBusPendingCallWatcher*)));
-
-    // set a dynamic property so we know which property are we reading
-    callWatcher->setProperty(DYNAMIC_PROPERTY, property);
-    return true;
-}
-
-/*
- * Writes a property value to theadaptorInterface synchronously. It is for pure testing purposes.
- */
-bool DBusServiceProperties::testProperty(const QString &property, const QVariant &value)
-{
-    if (objectPath.isEmpty()) {
-        return false;
-    }
-    QDBusInterface writeIFace(iface->interface(), objectPath, "org.freedesktop.DBus.Properties", connection);
-    if (!writeIFace.isValid()) {
-        // invalid interface
-        return false;
-    }
-    QDBusMessage msg = writeIFace.call("Set", adaptor, property, QVariant::fromValue(QDBusVariant(value)));
-    return msg.type() == QDBusMessage::ReplyMessage;
-}
-
-/*
- * Slot called when the async read operation finishes.
- */
-void DBusServiceProperties::readFinished(QDBusPendingCallWatcher *call)
-{
-    Q_Q(UCServiceProperties);
-    QDBusPendingReply<QVariant> reply = *call;
-    QString property = call->property(DYNAMIC_PROPERTY).toString();
-    scannedProperties.removeAll(property);
-    if (reply.isError()) {
-        // remove the property from being watched, as it has no property like that
-        properties.removeAll(property);
-        if (property[0].isUpper()) {
-            // report error!
-            qmlInfo(q) << reply.error().message();
-        }
-    } else {
-        // update watched property value
-        // make sure we have lower case when the property value is updated
-        property[0] = property[0].toLower();
-        q->setProperty(property.toLocal8Bit().constData(), reply.value());
-    }
-
-    if ((status == UCServiceProperties::Synchronizing) && scannedProperties.isEmpty()) {
-        // set status to active
-        setStatus(UCServiceProperties::Active);
-    }
-
-    // delete watcher
-    call->deleteLater();
-}
-
-/*
- * Slot called when service owner is changed.
- */
-void DBusServiceProperties::changeServiceOwner(const QString &serviceName, const QString &oldOwner, const QString &newOwner)
-{
-    Q_UNUSED(oldOwner);
-    Q_UNUSED(newOwner);
-    if (serviceName != service) {
-        return;
-    }
-    setupInterface();
-}
-
-/*
- * Slot called when the properties are changed in the service.
- */
-void DBusServiceProperties::updateProperties(const QString &onInterface, const QVariantMap &map, const QStringList &invalidated)
-{
-    Q_UNUSED(onInterface);
-    Q_UNUSED(map);
-    Q_FOREACH(const QString &property, invalidated) {
-        readProperty(property);
-    }
-}

=== removed file 'modules/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h'
--- modules/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h	2014-11-28 08:19:13 +0000
+++ modules/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DBUSPROPERTYWATCHER_P_H
-#define DBUSPROPERTYWATCHER_P_H
-
-#include <QtCore/QObject>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusServiceWatcher>
-#include <QtDBus/QDBusInterface>
-
-#include "ucserviceproperties_p.h"
-
-class QDBusPendingCallWatcher;
-class DBusServiceProperties : public QObject, public UCServicePropertiesPrivate
-{
-    Q_OBJECT
-    Q_DECLARE_PUBLIC(UCServiceProperties)
-public:
-    DBusServiceProperties(UCServiceProperties *qq);
-
-    bool init();
-    bool fetchPropertyValues();
-    bool readProperty(const QString &property);
-    // for testing purposes only!!!
-    bool testProperty(const QString &property, const QVariant &value);
-
-    QStringList scannedProperties;
-    QDBusConnection connection;
-    QDBusServiceWatcher *watcher;
-    QDBusInterface *iface;
-    QString objectPath;
-
-    bool setupInterface();
-
-public Q_SLOTS:
-    void readFinished(QDBusPendingCallWatcher *watcher);
-    void changeServiceOwner(const QString &serviceName, const QString &oldOwner, const QString &newOwner);
-    void updateProperties(const QString &iface, const QVariantMap &map, const QStringList &invalidated);
-};
-
-#endif // DBUSPROPERTYWATCHER_P_H

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-11-28 08:19:13 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-12-03 06:01:02 +0000
@@ -52,7 +52,6 @@
 #include "ucaction.h"
 #include "ucactioncontext.h"
 #include "ucactionmanager.h"
-#include "ucserviceproperties.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -163,7 +162,6 @@
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 1, 1, "SortFilterModel");
     qmlRegisterUncreatableType<FilterBehavior>(uri, 1, 1, "FilterBehavior", "Not instantiable");
     qmlRegisterUncreatableType<SortBehavior>(uri, 1, 1, "SortBehavior", "Not instantiable");
-    qmlRegisterType<UCServiceProperties, 1>(uri, 1, 1, "ServiceProperties");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-11-28 08:19:13 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2014-12-03 06:01:02 +0000
@@ -66,10 +66,7 @@
     ucaction.h \
     ucactioncontext.h \
     ucactionmanager.h \
-    adapters/actionsproxy_p.h \
-    adapters/dbuspropertywatcher_p.h \
-    ucserviceproperties.h \
-    ucserviceproperties_p.h
+    adapters/actionsproxy_p.h
 
 SOURCES += plugin.cpp \
     uctheme.cpp \
@@ -105,9 +102,7 @@
     ucaction.cpp \
     ucactioncontext.cpp \
     ucactionmanager.cpp \
-    adapters/actionsproxy_p.cpp \
-    adapters/dbuspropertywatcher_p.cpp \
-    ucserviceproperties.cpp
+    adapters/actionsproxy_p.cpp
 
 # adapters
 SOURCES += adapters/alarmsadapter_organizer.cpp

=== removed file 'modules/Ubuntu/Components/plugin/ucserviceproperties.cpp'
--- modules/Ubuntu/Components/plugin/ucserviceproperties.cpp	2014-11-28 08:19:13 +0000
+++ modules/Ubuntu/Components/plugin/ucserviceproperties.cpp	1970-01-01 00:00:00 +0000
@@ -1,317 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ucserviceproperties.h"
-#include "ucserviceproperties_p.h"
-#include "i18n.h"
-#include <QtQml/QQmlInfo>
-#include <QtCore/QMetaProperty>
-#include <QtQml/QQmlProperty>
-#include <QtQml/private/qqmlproperty_p.h>
-
-UCServicePropertiesPrivate::UCServicePropertiesPrivate(UCServiceProperties *qq)
-    : q_ptr(qq)
-    , ready(false)
-    , status(UCServiceProperties::Inactive)
-    , type(UCServiceProperties::System)
-{
-}
-
-UCServicePropertiesPrivate::~UCServicePropertiesPrivate()
-{
-}
-
-UCServicePropertiesPrivate *UCServicePropertiesPrivate::get(UCServiceProperties *service)
-{
-    return service->d_func();
-}
-
-void UCServicePropertiesPrivate::setError(const QString &msg)
-{
-    if (error == msg) {
-        return;
-    }
-    error = msg;
-    Q_EMIT q_ptr->errorChanged();
-}
-
-void UCServicePropertiesPrivate::setStatus(UCServiceProperties::Status status)
-{
-    if (this->status == status) {
-        return;
-    }
-    this->status = status;
-    Q_EMIT q_ptr->statusChanged();
-}
-
-void printLocked(UCServiceProperties *owner)
-{
-    qmlInfo(owner) << UbuntuI18n::instance().tr("Changing connection parameters forbidden.");
-}
-
-/*!
- * \qmltype ServiceProperties
- * \instantiates UCServiceProperties
- * \inqmlmodule Ubuntu.Components 1.1
- * \since Ubuntu.Components 1.1
- * \ingroup ubuntu-services
- * \brief The component enables accessing service properties from QML.
- *
- * The services accessed by the component are ones providing their interfaces
- * through DBus. The component is specialized to read properties exposed by these
- * services, andf to keep these property values up to date. It is not meant to
- * access signals or slots exposed, nor to change the values of the properties
- * watched.
- *
- * Properties watched should be declared within the body of the component like
- * any other QML property, preferably defining a default value for them. The component
- * will enumerate these properties and will ask the service to provide values for
- * those. When enumerating properties, each property will be checked twice, with
- * the case specified as well as with the first letter capitalized.
- * \qml
- * import QtQuick 2.3
- * import Ubuntu.Components 1.1
- *
- * ServiceProperties {
- *     service: "org.freenode.AccountsService"
- *     path: "/org/freenode/AccountsService"
- *     serviceInterface: "org.freenode.AccountsService"
- *     adaptorInterface: "com.ubuntu.touch.Accounts.Sound"
- *     // listing properties to watch
- *     // each property name existence will be checked against the current case
- *     // as well as with first character capitalized
- *     property bool incomingCallVibrate: true
- * }
- * \endqml
- *
- * Note that there are few properties which must be set in order the component
- * to work. These are \l service, \l path and \l adaptorInterface. Also, once
- * specified, \l service, \l serviceInterface and \l adaptorInterface values
- * should not be changed as it cannot be guaranteed that properties watched will
- * be available on those service. Therefore any change on these properties after
- * the component completion will be ignored. Property bindings on properties
- * watched will be ignored as well, as service will report changes in these property
- * values.
- *
- * The service is connected once the component gets completed (Component.onCompleted).
- * The \l error property specifies any error occured during connection, and the
- * \l status property notifies whether the connection to the service is active or not.
- *
- * \note Pay attention when chosing the service watched, and set your application's
- * AppArmor rights to ensure a successful service connection.
- */
-UCServiceProperties::UCServiceProperties(QObject *parent)
-    : QObject(parent)
-    , d_ptr(createServicePropertiesAdapter(this))
-{
-}
-UCServiceProperties::~UCServiceProperties()
-{
-    delete d_ptr;
-    d_ptr = 0;
-}
-
-void UCServiceProperties::classBegin()
-{
-}
-
-void UCServiceProperties::componentComplete()
-{
-    Q_D(UCServiceProperties);
-    d->ready = true;
-    // enumerate properties
-    const QMetaObject *mo = metaObject();
-    for (int i = mo->propertyOffset(); i < mo->propertyCount(); i++) {
-        const QMetaProperty prop = mo->property(i);
-        QString property(prop.name());
-
-        // check the binding on the property and warn if there is one.
-        QQmlProperty qmlProperty(this, property);
-        if (QQmlPropertyPrivate::binding(qmlProperty)) {
-            qmlInfo(this) << UbuntuI18n::instance().
-                             tr("Binding detected on property '%1' will be removed by the service updates.").
-                             arg(property);
-        }
-        // insert both the declared and capitalized first character properties
-        d->properties << property;
-        property[0] = property[0].toUpper();
-        d->properties << property;
-    }
-    // initialize DBus
-    if (d->init()) {
-        d->setStatus(UCServiceProperties::Synchronizing);
-        d->fetchPropertyValues();
-    }
-}
-
-/*!
- * \qmlproperty enum ServiceProperties::type
- * Specifies the DBus connection session type. It can get the following values:
- * \list
- *  \li - \e ServiceProperties.System when system bus is used (default)
- *  \li - \e ServiceProperties.Session when session bus is used
- * \endlist
- */
-UCServiceProperties::ServiceType UCServiceProperties::type() const
-{
-    Q_D(const UCServiceProperties);
-    return d->type;
-}
-void UCServiceProperties::setType(ServiceType type)
-{
-    Q_D(UCServiceProperties);
-    if (d->type == type) {
-        return;
-    }
-    if (d->ready) {
-        printLocked(this);
-        return;
-    }
-    d->type = type;
-    Q_EMIT typeChanged();
-}
-
-/*!
- * \qmlproperty string ServiceProperties::service
- * The proeprty specifies the DBus service URI. It is mandatory to be specified.
- */
-QString UCServiceProperties::service() const
-{
-    Q_D(const UCServiceProperties);
-    return d->service;
-}
-void UCServiceProperties::setService(const QString &value)
-{
-    Q_D(UCServiceProperties);
-    if (d->service == value) {
-        return;
-    }
-    if (d->ready) {
-        printLocked(this);
-        return;
-    }
-    d->service = value;
-    Q_EMIT serviceChanged();
-}
-
-/*!
- * \qmlproperty string ServiceProperties::path
- * The property specifies the DBus service connection path. It is mandatory to be
- * specified.
- */
-QString UCServiceProperties::path() const
-{
-    Q_D(const UCServiceProperties);
-    return d->path;
-}
-void UCServiceProperties::setPath(const QString &value)
-{
-    Q_D(UCServiceProperties);
-    if (d->path == value) {
-        return;
-    }
-    d->path = value;
-    Q_EMIT pathChanged();
-    if (d->ready) {
-        // need to re-initialize connections
-        d->init();
-    }
-}
-
-/*!
- * \qmlproperty string ServiceProperties::serviceInterface
- * The property specifies the service intertface. If it is an empty string, the
- * component will refer to the merging of all interfaces found in the service.
- */
-QString UCServiceProperties::interface() const
-{
-    Q_D(const UCServiceProperties);
-    return d->interface;
-}
-void UCServiceProperties::setInterface(const QString &value)
-{
-    Q_D(UCServiceProperties);
-    if (d->interface == value) {
-        return;
-    }
-    if (d->ready) {
-        printLocked(this);
-        return;
-    }
-    d->interface = value;
-    Q_EMIT serviceInterfaceChanged();
-}
-/*!
- * \qmlproperty string ServiceProperties::adaptorInterface
- * The proeprty specifies the dbus adaptor interface which provides the properties
- * watched. This can be a different interface that the one specified in \l serviceInterface,
- * and in the same way, it can be empty, in which case all the properties from all
- * interfaces of the service will be watched.
- */
-QString UCServiceProperties::adaptor() const
-{
-    Q_D(const UCServiceProperties);
-    return d->adaptor;
-}
-void UCServiceProperties::setAdaptor(const QString &value)
-{
-    Q_D(UCServiceProperties);
-    if (d->adaptor == value) {
-        return;
-    }
-    if (d->ready) {
-        printLocked(this);
-        return;
-    }
-    d->adaptor = value;
-    Q_EMIT adaptorInterfaceChanged();
-}
-
-/*!
- * \qmlproperty string ServiceProperties::error
- * The property is set with a human readablestring each time an error occurrs
- * during the service connection. Empty string means no error.
- */
-QString UCServiceProperties::error()
-{
-    Q_D(UCServiceProperties);
-    return d->error;
-}
-
-/*!
- * \qmlproperty enum ServiceProperties::status
- * The property presents the status of the component.
- * \list
- *  \li - \e ServiceProperties.Inactive - the component is inactive, initial state
- *  \li - \e ServiceProperties.ConnectionError - there was a connection error, the
- *      \l error contains the error string.
- *  \li - \e ServiceProperties.Synchronizing - the connection to the service succeeded,
- *      and the properties are being synchronized;
- *  \li - \e ServiceProperties.Active - the service watcher is active and initial
- *      property synchronization completed.
- * \endlist
- * \note While the status is set to \e Synchronizing, the properties are checked
- * against their existence in the service. Each proeprty will be checked as declared
- * as well with capital first letter. If neither of these exists in the service,
- * it will be reported in the \l error property separately.
- */
-UCServiceProperties::Status UCServiceProperties::status() const
-{
-    Q_D(const UCServiceProperties);
-    return d->status;
-}
-
-#include "moc_ucserviceproperties.cpp"

=== removed file 'modules/Ubuntu/Components/plugin/ucserviceproperties.h'
--- modules/Ubuntu/Components/plugin/ucserviceproperties.h	2014-11-28 08:19:13 +0000
+++ modules/Ubuntu/Components/plugin/ucserviceproperties.h	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UCSERVICEPROPERTIES_H
-#define UCSERVICEPROPERTIES_H
-
-#include <QtCore/QObject>
-#include <QtQml/QQmlParserStatus>
-
-class UCServicePropertiesPrivate;
-class UCServiceProperties : public QObject, public QQmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QQmlParserStatus)
-
-    Q_PROPERTY(ServiceType type READ type WRITE setType NOTIFY typeChanged REVISION 1)
-    Q_PROPERTY(QString service READ service WRITE setService NOTIFY serviceChanged REVISION 1)
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged REVISION 1)
-    Q_PROPERTY(QString serviceInterface READ interface WRITE setInterface NOTIFY serviceInterfaceChanged REVISION 1)
-    Q_PROPERTY(QString adaptorInterface READ adaptor WRITE setAdaptor NOTIFY adaptorInterfaceChanged REVISION 1)
-    Q_PROPERTY(QString error READ error NOTIFY errorChanged REVISION 1)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged REVISION 1)
-
-    Q_ENUMS(ServiceType Status)
-public:
-    enum ServiceType {
-        Undefined,
-        System,
-        Session
-    };
-    enum Status {
-        Inactive,
-        ConnectionError,
-        Synchronizing,
-        Active
-    };
-
-    explicit UCServiceProperties(QObject *parent = 0);
-    ~UCServiceProperties();
-    void classBegin();
-    void componentComplete();
-
-    ServiceType type() const;
-    void setType(ServiceType type);
-    QString service() const;
-    void setService(const QString &value);
-    QString path() const;
-    void setPath(const QString &value);
-    QString interface() const;
-    void setInterface(const QString &value);
-    QString adaptor() const;
-    void setAdaptor(const QString &value);
-    QString error();
-    Status status() const;
-
-Q_SIGNALS:
-    void typeChanged();
-    void serviceChanged();
-    void pathChanged();
-    void serviceInterfaceChanged();
-    void adaptorInterfaceChanged();
-    void errorChanged();
-    void statusChanged();
-
-private:
-    UCServicePropertiesPrivate *d_ptr;
-    Q_DECLARE_PRIVATE_D(d_ptr, UCServiceProperties)
-};
-
-#endif // UCSERVICEPROPERTIES_H

=== removed file 'modules/Ubuntu/Components/plugin/ucserviceproperties_p.h'
--- modules/Ubuntu/Components/plugin/ucserviceproperties_p.h	2014-11-28 08:19:13 +0000
+++ modules/Ubuntu/Components/plugin/ucserviceproperties_p.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UCSERVICEPROPERTIES_P_H
-#define UCSERVICEPROPERTIES_P_H
-
-#include "ucserviceproperties.h"
-#include <QtCore/QStringList>
-
-class UCServicePropertiesPrivate
-{
-public:
-    UCServicePropertiesPrivate(UCServiceProperties *qq);
-    virtual ~UCServicePropertiesPrivate();
-
-    static UCServicePropertiesPrivate *get(UCServiceProperties *service);
-    void setError(const QString &msg);
-    void setStatus(UCServiceProperties::Status status);
-
-    virtual bool init() = 0;
-    virtual bool fetchPropertyValues() = 0;
-    virtual bool readProperty(const QString &property) = 0;
-    virtual bool testProperty(const QString &property, const QVariant &value) = 0;
-
-    // data
-    UCServiceProperties *q_ptr;
-    bool ready:1;
-    UCServiceProperties::Status status;
-    UCServiceProperties::ServiceType type;
-    QString service;
-    QString path;
-    QString interface;
-    QString adaptor;
-    QString error;
-    QStringList properties;
-};
-
-UCServicePropertiesPrivate *createServicePropertiesAdapter(UCServiceProperties *owner);
-
-#endif // UCSERVICEPROPERTIES_P_H

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2014-11-28 09:06:48 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2014-12-03 06:01:02 +0000
@@ -99,8 +99,6 @@
     }
     pathList << QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath).split(':', QString::SkipEmptyParts);
 
-    // prepend current folder
-    pathList.prepend(QDir::currentPath()); 
     // fix folders
     QStringList result;
     Q_FOREACH(const QString &path, pathList) {
@@ -141,7 +139,7 @@
 
     QStringList paths = themeSearchPath();
     Q_FOREACH(const QString &path, paths) {
-        if (QDir(path).exists() && !m_engine->importPathList().contains(path)) {
+        if (QDir(path).exists()) {
             m_engine->addImportPath(path);
         }
     }

=== removed directory 'tests/unit_x11/tst_serviceproperties'
=== removed file 'tests/unit_x11/tst_serviceproperties/IncomingCallVibrateWatcher.qml'
--- tests/unit_x11/tst_serviceproperties/IncomingCallVibrateWatcher.qml	2014-11-28 08:19:13 +0000
+++ tests/unit_x11/tst_serviceproperties/IncomingCallVibrateWatcher.qml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-
-Item {
-    property alias service: service
-    ServiceProperties {
-        id: service
-        service: "org.freedesktop.Accounts"
-        serviceInterface: "org.freedesktop.Accounts"
-        path: "/org/freedesktop/Accounts"
-        adaptorInterface: "com.ubuntu.touch.AccountsService.Sound"
-
-        property bool incomingCallVibrate: true
-    }
-}

=== removed file 'tests/unit_x11/tst_serviceproperties/InvalidPropertyWatcher.qml'
--- tests/unit_x11/tst_serviceproperties/InvalidPropertyWatcher.qml	2014-11-28 08:19:13 +0000
+++ tests/unit_x11/tst_serviceproperties/InvalidPropertyWatcher.qml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-
-Item {
-    property alias service: service
-    ServiceProperties {
-        id: service
-        service: "org.freedesktop.Accounts"
-        serviceInterface: "org.freedesktop.Accounts"
-        path: "/org/freedesktop/Accounts"
-        adaptorInterface: "com.ubuntu.touch.AccountsService.Sound"
-
-        property bool thisIsAnInvalidPropertyToWatch: true
-    }
-}

=== removed file 'tests/unit_x11/tst_serviceproperties/InvalidPropertyWatcher2.qml'
--- tests/unit_x11/tst_serviceproperties/InvalidPropertyWatcher2.qml	2014-11-28 08:19:13 +0000
+++ tests/unit_x11/tst_serviceproperties/InvalidPropertyWatcher2.qml	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-
-Item {
-    property alias service: service
-    ServiceProperties {
-        id: service
-        service: "org.freedesktop.Accounts"
-        serviceInterface: "org.freedesktop.Accounts"
-        path: "/org/freedesktop/Accounts"
-        adaptorInterface: "com.ubuntu.touch.AccountsService.Sound"
-
-        property bool thisIsAnInvalidPropertyToWatch: true
-        property bool incomingCallVibrate: true
-    }
-}

=== removed file 'tests/unit_x11/tst_serviceproperties/tst_serviceproperties.cpp'
--- tests/unit_x11/tst_serviceproperties/tst_serviceproperties.cpp	2014-11-28 08:19:13 +0000
+++ tests/unit_x11/tst_serviceproperties/tst_serviceproperties.cpp	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "uctestcase.h"
-#include "ucserviceproperties.h"
-#include "ucserviceproperties_p.h"
-#include <QtCore/QString>
-#include <QtCore/QDebug>
-#include <QtTest/QTest>
-#include <QtTest/QSignalSpy>
-
-class tst_ServiceProperties : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_ServiceProperties() {}
-
-private:
-
-    // FIXME use UbuntuTestCase::ignoreWaring in Vivid
-    void ignoreWarning(const QString& fileName, uint line, uint column, const QString& message, uint occurences=1)
-    {
-        for (uint i = 0; i < occurences; i++) {
-            QString url(QUrl::fromLocalFile(QFileInfo(fileName).absoluteFilePath()).toEncoded());
-            QString warning(QString("%1:%2:%3: %4").arg(url).arg(line).arg(column).arg(message));
-            QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
-        }
-    }
-
-private Q_SLOTS:
-
-    void test_change_property()
-    {
-        QScopedPointer<UbuntuTestCase> test(new UbuntuTestCase("IncomingCallVibrateWatcher.qml"));
-        UCServiceProperties *watcher = static_cast<UCServiceProperties*>(test->rootObject()->property("service").value<QObject*>());
-        QVERIFY(watcher);
-        if (watcher->property("status").toInt() != UCServiceProperties::Active) {
-            QSignalSpy wait(watcher, SIGNAL(statusChanged()));
-            wait.wait();
-        }
-
-        bool backup = watcher->property("incomingCallVibrate").toBool();
-        UCServicePropertiesPrivate *pWatcher = UCServicePropertiesPrivate::get(watcher);
-        QSignalSpy spy(watcher, SIGNAL(incomingCallVibrateChanged()));
-        pWatcher->testProperty("IncomingCallVibrate", !backup);
-        spy.wait(400);
-        QCOMPARE(spy.count(), 1);
-        QCOMPARE(watcher->property("incomingCallVibrate").toBool(), !backup);
-
-        // restore value
-        spy.clear();
-        pWatcher->testProperty("IncomingCallVibrate", backup);
-        spy.wait(400);
-    }
-
-    void test_invalid_property()
-    {
-        ignoreWarning("InvalidPropertyWatcher.qml", 22, 5, "QML ServiceProperties: No such property 'ThisIsAnInvalidPropertyToWatch'");
-        QScopedPointer<UbuntuTestCase> test(new UbuntuTestCase("InvalidPropertyWatcher.qml"));
-        UCServiceProperties *watcher = static_cast<UCServiceProperties*>(test->rootObject()->property("service").value<QObject*>());
-        QVERIFY(watcher);
-        if (watcher->property("status").toInt() != UCServiceProperties::Active) {
-            QSignalSpy wait(watcher, SIGNAL(statusChanged()));
-            wait.wait();
-        }
-        // error should not be set
-        QVERIFY(watcher->property("error").toString().isEmpty());
-    }
-
-    void test_one_valid_one_invalid_property()
-    {
-        ignoreWarning("InvalidPropertyWatcher2.qml", 22, 5, "QML ServiceProperties: No such property 'ThisIsAnInvalidPropertyToWatch'");
-        QScopedPointer<UbuntuTestCase> test(new UbuntuTestCase("InvalidPropertyWatcher2.qml"));
-        UCServiceProperties *watcher = static_cast<UCServiceProperties*>(test->rootObject()->property("service").value<QObject*>());
-        QVERIFY(watcher);
-        if (watcher->property("status").toInt() != UCServiceProperties::Active) {
-            QSignalSpy wait(watcher, SIGNAL(statusChanged()));
-            wait.wait();
-        }
-        // error should not be set
-        QVERIFY(watcher->property("error").toString().isEmpty());
-    }
-
-    void test_change_connection_props_data()
-    {
-        QTest::addColumn<QString>("property");
-        QTest::addColumn<QString>("value");
-
-        QTest::newRow("Changing servcie") << "service" << "anything.else";
-        QTest::newRow("Changing interface") << "serviceInterface" << "anything.else";
-        QTest::newRow("Changing adaptor") << "adaptorInterface" << "anything.else";
-    }
-    void test_change_connection_props()
-    {
-        QFETCH(QString, property);
-        QFETCH(QString, value);
-
-        ignoreWarning("IncomingCallVibrateWatcher.qml", 22, 5, "QML ServiceProperties: Changing connection parameters forbidden.");
-        QScopedPointer<UbuntuTestCase> test(new UbuntuTestCase("IncomingCallVibrateWatcher.qml"));
-        UCServiceProperties *watcher = static_cast<UCServiceProperties*>(test->rootObject()->property("service").value<QObject*>());
-        QVERIFY(watcher);
-        if (watcher->property("status").toInt() != UCServiceProperties::Active) {
-            QSignalSpy wait(watcher, SIGNAL(statusChanged()));
-            wait.wait();
-        }
-
-        // try to change the property
-        QSignalSpy errorSpy(watcher, SIGNAL(errorChanged()));
-        watcher->setProperty(property.toLocal8Bit().constData(), value);
-        // no error should be reported
-        QCOMPARE(errorSpy.count(), 0);
-    }
-
-};
-
-QTEST_MAIN(tst_ServiceProperties)
-
-#include "tst_serviceproperties.moc"

=== removed file 'tests/unit_x11/tst_serviceproperties/tst_serviceproperties.pro'
--- tests/unit_x11/tst_serviceproperties/tst_serviceproperties.pro	2014-11-28 08:19:13 +0000
+++ tests/unit_x11/tst_serviceproperties/tst_serviceproperties.pro	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-include(../test-include.pri)
-SOURCES += \
-    tst_serviceproperties.cpp
-
-OTHER_FILES += \
-    IncomingCallVibrateWatcher.qml \
-    InvalidPropertyWatcher.qml \
-    InvalidPropertyWatcher2.qml

=== removed directory 'tests/unit_x11/tst_theme_engine/AppTheme'
=== removed file 'tests/unit_x11/tst_theme_engine/AppTheme/Palette.qml'
--- tests/unit_x11/tst_theme_engine/AppTheme/Palette.qml	2014-11-28 09:06:48 +0000
+++ tests/unit_x11/tst_theme_engine/AppTheme/Palette.qml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.SuruDark 1.1 as Suru
-
-Suru.Palette {
-    normal.background: "#A21E1C"
-    selected.backgroundText: "lightblue"
-}

=== removed file 'tests/unit_x11/tst_theme_engine/AppTheme/parent_theme'
--- tests/unit_x11/tst_theme_engine/AppTheme/parent_theme	2014-11-28 09:06:48 +0000
+++ tests/unit_x11/tst_theme_engine/AppTheme/parent_theme	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Ubuntu.Components.Themes.SuruDark

=== removed file 'tests/unit_x11/tst_theme_engine/TestApp.qml'
--- tests/unit_x11/tst_theme_engine/TestApp.qml	2014-11-28 09:06:48 +0000
+++ tests/unit_x11/tst_theme_engine/TestApp.qml	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-MainView {
-    width: units.gu(40)
-    height: units.gu(71)
-
-    Component.onCompleted: Theme.name = "AppTheme"
-
-    Label {
-        objectName: "test_label"
-    }
-}

=== modified file 'tests/unit_x11/tst_theme_engine/tst_theme_engine.pro'
--- tests/unit_x11/tst_theme_engine/tst_theme_engine.pro	2014-11-28 09:06:48 +0000
+++ tests/unit_x11/tst_theme_engine/tst_theme_engine.pro	2014-12-03 06:01:02 +0000
@@ -1,7 +1,5 @@
 include(../test-include.pri)
-QT += quick-private gui-private
 SOURCES += tst_theme_enginetest.cpp
 
 OTHER_FILES += \
-    TestStyle.qml \
-    TestApp.qml
+    TestStyle.qml

=== modified file 'tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp'
--- tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp	2014-11-28 09:06:48 +0000
+++ tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp	2014-12-03 06:01:02 +0000
@@ -21,7 +21,6 @@
 #include <QtQml/QQmlComponent>
 #include "uctheme.h"
 #include "uctestcase.h"
-#include <private/qquicktext_p.h>
 
 Q_DECLARE_METATYPE(QList<QQmlError>)
 
@@ -47,7 +46,6 @@
     void testNoImportPathSet();
     void testBogusImportPathSet();
     void testMultipleImportPathsSet();
-    void testAppTheme();
 };
 
 void tst_UCTheme::initTestCase()
@@ -195,18 +193,7 @@
     QQmlComponent* component = theme.createStyleComponent("TestStyle.qml", parent);
 
     QCOMPARE(component != NULL, true);
-    QCOMPARE(component->status(), QQmlComponent::Ready);
-}
-
-void tst_UCTheme::testAppTheme()
-{
-    QScopedPointer<UbuntuTestCase> test(new UbuntuTestCase("TestApp.qml"));
-    QColor backgroundColor = test->rootObject()->property("backgroundColor").value<QColor>();
-    QCOMPARE(backgroundColor, QColor("#A21E1C"));
-    QQuickText *label = test->findItem<QQuickText*>("test_label");
-    QVERIFY(label);
-    QCOMPARE(label->color(), QColor("lightblue"));
-}
+    QCOMPARE(component->status(), QQmlComponent::Ready);}
 
 void tst_UCTheme::testNoImportPathSet()
 {

=== modified file 'tests/unit_x11/unit_x11.pro'
--- tests/unit_x11/unit_x11.pro	2014-11-28 08:19:13 +0000
+++ tests/unit_x11/unit_x11.pro	2014-12-03 06:01:02 +0000
@@ -11,5 +11,4 @@
     tst_orientation \
     tst_layouts \
     tst_mousefilters \
-    tst_animator \
-    tst_serviceproperties
+    tst_animator