Merge lp:~bzoltan/ubuntu-ui-toolkit/landing-1010 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

[ Renato Filho ]
  * Save alarms in invalid time zone. Use invalid time zone to
    floating time alarms. Fixes LP: #1311165

  [ Tim Peeters ]
  * Make icons from theme in showcase gallery scrollable.
    Fixes: LP: #1336279.
  * Fix width of header contents. Fixes LP: #1378261.

  [ Sebastien Bacher ]
  * Don't use simple quotes around translatable strings, xgetting
    ignore those. Fixes LP: #1378774.

  [ Zsombor Egri ]
  * Alarm update regression caused by EDS changes. Also fixes Tags
    update. Requires qtorganizer5-eds updates as well!.
    Fixes LP: #1364949.

  [ Christian Dywan ]
  * Make dialog contents scrollable. Fixes LP: #1376763
  * Make mouseMoveSlowly work with a negative distance.
    Fixes LP: #1343334

[ Renato Filho ]
  * Save alarms in invalid time zone. Use invalid time zone to
    floating time alarms. Fixes LP: #1311165

  [ Tim Peeters ]
  * Make icons from theme in showcase gallery scrollable.
    Fixes: LP: #1336279.
  * Fix width of header contents. Fixes LP: #1378261.

  [ Sebastien Bacher ]
  * Don't use simple quotes around translatable strings, xgetting
    ignore those. Fixes LP: #1378774.

  [ Zsombor Egri ]
  * Alarm update regression caused by EDS changes. Also fixes Tags
    update. Requires qtorganizer5-eds updates as well!.
    Fixes LP: #1364949.

  [ Christian Dywan ]
  * Make dialog contents scrollable. Fixes LP: #1376763
  * Make mouseMoveSlowly work with a negative distance.
    Fixes LP: #1343334

[lp:~bzoltan/ubuntu-ui-toolkit/landing-1010]

1289. By Zoltan Balogh on 2014-10-16

Sync from staging

1290. By Zoltan Balogh on 2014-10-16

Sync from landing branch

1291. By Zoltan Balogh on 2014-10-16

Fix qmlapicheck

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-14 14:40:58 +0000
+++ debian/changelog	2014-10-16 12:58:00 +0000
@@ -1,3 +1,85 @@
+ubuntu-ui-toolkit (1.1.1298+14.10.20141007-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Jussi Pakkanen]
+  * Remove the thumbnailer image provider here, because thumbnailer 
+    provides it by itself Fixes LP: #1368492
+
+  [ Lars Uebernickel ]
+  * Icon: size correctly even if no or only one dimension is given
+
+  [ Michael Sheldon] 
+  * Check that orientation changes are acceptable before applying new
+    orientation based on active window change. Fixes LP: #1375306
+
+  [ Zoltán Balogh ]
+  * Updated test plan executer
+
+  [ Zeller Benjamin ]
+  * RenderTimer includes EGL platform files in the rendertime header,
+    which can cause problems when included after QDataStream. The 
+    EGL headers pull the XLib files which define the Symbol Status.
+  * Preparing qmlapicheck to support out of source builds for the 
+    cmake migration
+
+  [ Renato Filho ]
+  * Save alarms in invalid time zone. Use invalid time zone to 
+    floating time alarms.
+
+  [ Tim Peeters ]
+  * Make icons from theme in showcase gallery scrollable. 
+    Fixes: LP: #1336279.
+  * Fix width of header contents. Fixes LP: #1378261.
+
+  [ Sebastien Bacher ]
+  * Don't use simple quotes around translatable strings, xgetting 
+    ignore those. Fixes LP: #1378774.
+
+  [ Zsombor Egri ] 
+  * Alarm update regression caused by EDS changes. Also fixes Tags 
+    update. Requires qtorganizer5-eds updates as well!. 
+    Fixes LP: #1364949.
+  * Forgotten Interface declaration in objects. Fixes LP: #1378298
+
+  [ Christian Dywan ]
+  * Make dialog contents scrollable. Fixes LP: #1376763
+  * Make mouseMoveSlowly work with a negative distance. 
+    Fixes LP: #1343334
+  * Read-only text entries don't blink or visibly take focus 
+    Fixes LP: #1370571
+  * Anchor overflow button labels to the right. 
+    Fixes LP: #1354812 LP: #1378247
+  * Don't allow inserting a line break into readOnly text areas. 
+    Fixes LP: #1334344
+
+ -- Zoltán Balogh <[e-mail]>  Fri, 10 Oct 2014 11:19:10 +0300
+
+ubuntu-ui-toolkit (1.1.1286+14.10.20141007-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Renato Filho ]
+  * Save alarms in invalid time zone. Use invalid time zone to 
+    floating time alarms.
+
+  [ Tim Peeters ]
+  * Make icons from theme in showcase gallery scrollable. 
+    Fixes: LP: #1336279.
+  * Fix width of header contents. Fixes LP: #1378261.
+
+  [ Sebastien Bacher ]
+  * Don't use simple quotes around translatable strings, xgetting 
+    ignore those. Fixes LP: #1378774.
+
+  [ Zsombor Egri ] 
+  * Alarm update regression caused by EDS changes. Also fixes Tags 
+    update. Requires qtorganizer5-eds updates as well!. 
+    Fixes LP: #1364949.
+
+  [ Christian Dywan ]
+  * Make dialog contents scrollable. Fixes LP: #1376763
+  * Make mouseMoveSlowly work with a negative distance. 
+    Fixes LP: #1343334
+
+ -- Zoltán Balogh <[e-mail]>  Fri, 10 Oct 2014 11:19:10 +0300
+
 ubuntu-ui-toolkit (1.1.1279.1+14.10.20141014-0ubuntu1) 14.09; urgency=low
 
   [ Ubuntu daily release ]

=== modified file 'debian/control'
--- debian/control	2014-10-01 07:35:42 +0000
+++ debian/control	2014-10-16 12:58:00 +0000
@@ -35,7 +35,6 @@
                libqt5organizer5,
                qtpim5-dev,
                language-pack-en-base,
-               libthumbnailer-dev,
                libdbus-1-dev,
                libnih-dbus-dev,
                xvfb,

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Icons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Icons.qml	2014-07-31 14:14:56 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Icons.qml	2014-10-16 12:58:00 +0000
@@ -79,10 +79,11 @@
         TemplateRow {
             title: i18n.tr("Theme")
             spacing: units.gu(2)
-
+            height: iconFlow.height
 
             Flow {
-                anchors.fill: parent
+                id: iconFlow
+                width: parent.width
                 spacing: units.gu(2)
 
                 Repeater {

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2014-08-07 10:28:01 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2014-10-16 12:58:00 +0000
@@ -33,7 +33,7 @@
         text: templateRow.title
         width: templateRow.titleWidth
         anchors.left: parent.left
-        anchors.verticalCenter: contentRow.verticalCenter
+        anchors.top: contentRow.top
         elide: Text.ElideRight
         font.weight: Font.Light
     }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TextInputs.qml'
--- examples/ubuntu-ui-toolkit-gallery/TextInputs.qml	2014-09-17 15:11:08 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TextInputs.qml	2014-10-16 12:58:00 +0000
@@ -74,10 +74,22 @@
         }
 
         TemplateRow {
+            title: i18n.tr("Read-only")
+
+            TextField {
+                objectName: "textfield_read_only"
+                text: i18n.tr("Nobody type here")
+                readOnly: true
+                width: parent.width
+            }
+        }
+
+        TemplateRow {
             title: i18n.tr("Disabled")
 
             TextField {
                 objectName: "textfield_disabled"
+                text: i18n.tr("No interaction allowed")
                 enabled: false
                 width: parent.width
             }

=== modified file 'modules/Ubuntu/Components/Icon10.qml'
--- modules/Ubuntu/Components/Icon10.qml	2014-09-19 13:22:18 +0000
+++ modules/Ubuntu/Components/Icon10.qml	2014-10-16 12:58:00 +0000
@@ -31,45 +31,27 @@
     */
     property alias keyColor: colorizedImage.keyColorIn
 
+    implicitWidth: image.implicitWidth
+    implicitHeight: image.implicitHeight
+
     Image {
         id: image
         objectName: "image"
         anchors.fill: parent
+        fillMode: Image.PreserveAspectFit
 
-        /* Necessary so that icons are not loaded before a size is set. */
-        source: ""
         sourceSize {
-            width: 0
-            height: 0
-        }
-
-        Component.onCompleted: update()
-        onWidthChanged: update()
-        onHeightChanged: update()
-        Connections {
-            target: icon
-            ignoreUnknownSignals: true
-            onNameChanged: image.update()
-            onSourceChanged: image.update()
-        }
-
-        function update() {
-            // only set sourceSize.width, sourceSize.height and source when
-            // icon dimensions are valid, see bug #1349769.
-            if (width > 0 && height > 0
-                    && (icon.name || (icon.hasOwnProperty("source") && icon.source))) {
-                sourceSize.width = width;
-                sourceSize.height = height;
-                if (icon.hasOwnProperty("source")) {
-                    source = icon.source;
-                } else {
-                    source = "image://theme/%1".arg(icon.name);
-                }
-            } else {
-                source = "";
-                sourceSize.width = 0;
-                sourceSize.height = 0;
-            }
+            width: icon.width
+            height: icon.height
+        }
+
+        source: {
+            if (icon.hasOwnProperty("source"))
+                return icon.source;
+            else if (icon.name)
+                return "image://theme/%1".arg(icon.name);
+            else
+                return "";
         }
 
         cache: true

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-09-09 16:03:39 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-10-16 12:58:00 +0000
@@ -410,7 +410,7 @@
                         width: units.gu(5)
                     }
                     Label {
-                        text: i18n.dtr('ubuntu-ui-toolkit', 'Delete')
+                        text: i18n.dtr('ubuntu-ui-toolkit', "Delete")
                         verticalAlignment: Text.AlignVCenter
                         anchors {
                             verticalCenter: parent.verticalCenter

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2014-07-10 11:50:13 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2014-10-16 12:58:00 +0000
@@ -134,7 +134,10 @@
                 window.contentOrientation = Screen.orientation
         }
 
-        onWindowActiveChanged: applyOrientation()
+        onWindowActiveChanged: {
+            if (automaticOrientation)
+                applyOrientation();
+        }
 
         state: orientationAngle.toString()
 

=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2014-10-01 10:21:28 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2014-10-16 12:58:00 +0000
@@ -173,43 +173,46 @@
 
         height: Math.min(contentsColumn.height + foreground.margins, dialog.height)
 
-        Column {
-            id: contentsColumn
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-                margins: foreground.margins
-            }
-            spacing: foreground.itemSpacing
-            height: childrenRect.height + foreground.margins
-            onWidthChanged: updateChildrenWidths();
-
-            Label {
-                horizontalAlignment: Text.AlignHCenter
-                text: dialog.title
-                wrapMode: Text.Wrap
-                maximumLineCount: 2
-                elide: Text.ElideRight
-                fontSize: "large"
-                color: UbuntuColors.darkGrey
-                visible: (text !== "")
-            }
-
-            Label {
-                horizontalAlignment: Text.AlignHCenter
-                text: dialog.text
-                fontSize: "medium"
-                color: UbuntuColors.darkGrey
-                wrapMode: Text.Wrap
-                visible: (text !== "")
-            }
-
-            onChildrenChanged: updateChildrenWidths()
-
-            function updateChildrenWidths() {
-                for (var i = 0; i < children.length; i++) {
-                    children[i].width = contentsColumn.width;
+        Flickable {
+            anchors.fill: parent
+            anchors.margins: foreground.margins
+            contentWidth: contentsColumn.width
+            contentHeight: contentsColumn.height - foreground.margins
+            boundsBehavior: Flickable.StopAtBounds
+
+            Column {
+                id: contentsColumn
+                spacing: foreground.itemSpacing
+                width: foreground.width - foreground.margins * 2 - foreground.itemSpacing
+                height: childrenRect.height + foreground.margins
+                onWidthChanged: updateChildrenWidths();
+
+                Label {
+                    horizontalAlignment: Text.AlignHCenter
+                    text: dialog.title
+                    wrapMode: Text.Wrap
+                    maximumLineCount: 2
+                    elide: Text.ElideRight
+                    fontSize: "large"
+                    color: UbuntuColors.darkGrey
+                    visible: (text !== "")
+                }
+
+                Label {
+                    horizontalAlignment: Text.AlignHCenter
+                    text: dialog.text
+                    fontSize: "medium"
+                    color: UbuntuColors.darkGrey
+                    wrapMode: Text.Wrap
+                    visible: (text !== "")
+                }
+
+                onChildrenChanged: updateChildrenWidths()
+
+                function updateChildrenWidths() {
+                    for (var i = 0; i < children.length; i++) {
+                        children[i].width = contentsColumn.width;
+                    }
                 }
             }
         }

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-07-11 15:11:02 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2014-10-16 12:58:00 +0000
@@ -776,6 +776,8 @@
     // grab Enter/Return keys which may be stolen from parent components of TextArea
     // due to forwarded keys from TextEdit
     Keys.onPressed: {
+        if (readOnly)
+            return;
         if ((event.key === Qt.Key_Enter) || (event.key === Qt.Key_Return)) {
             if (editor.textFormat === TextEdit.RichText) {
                 // FIXME: use control.paste("<br />") instead when paste() gets sich text support

=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2014-09-19 09:07:48 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2014-10-16 12:58:00 +0000
@@ -129,6 +129,7 @@
     }
     property bool typing: false
     property bool contextMenuVisible: false
+    property bool readOnly: handler.main.readOnly
     function contextMenuHidden(p) {
         contextMenuVisible = false
     }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-10-14 14:33:50 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-10-16 12:58:00 +0000
@@ -540,6 +540,7 @@
                                             verticalCenterOffset: units.dp(-1)
                                             left: actionIcon.right
                                             leftMargin: units.gu(2)
+                                            right: parent.right
                                         }
                                         fontSize: "small"
                                         elide: Text.ElideRight

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2014-09-18 15:42:37 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2014-10-16 12:58:00 +0000
@@ -61,6 +61,7 @@
         onErrorChanged: (error) ? visuals.errorColor : visuals.backgroundColor;
         color: visuals.backgroundColor;
         anchors.fill: parent
+        visible: !styledItem.readOnly
     }
 
     Loader {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-09-22 07:19:56 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-10-16 12:58:00 +0000
@@ -63,6 +63,7 @@
                 running: (cursorStyle.cursorVisibleTimeout > 0) &&
                          (cursorStyle.cursorHiddenTimeout > 0) &&
                          styledItem.visible &&
+                         !styledItem.readOnly &&
                          !styledItem.contextMenuVisible &&
                          styledItem.positionProperty === "cursorPosition"
                 repeat: true

=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml	2014-05-23 09:27:57 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml	2014-10-16 12:58:00 +0000
@@ -139,7 +139,7 @@
     property Item back: ToolbarButton {
         objectName: "back_toolbar_button"
         iconSource: Qt.resolvedUrl("artwork/back.png")
-        text: i18n.dtr('ubuntu-ui-toolkit', 'Back')
+        text: i18n.dtr('ubuntu-ui-toolkit', "Back")
         visible: toolbarItems.pageStack && toolbarItems.pageStack.depth > 1
         /*!
           If there is a \l PageStack of sufficient depth, triggering the back button

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2014-09-25 08:19:55 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2014-10-16 12:58:00 +0000
@@ -25,6 +25,7 @@
 
 #include <QtCore/QFile>
 #include <QtCore/QDir>
+#include <QtCore/QTimeZone>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
@@ -127,7 +128,7 @@
 
         AlarmData alarm;
         alarm.message = object["message"].toString();
-        alarm.originalDate = alarm.date = AlarmData::transcodeDate(QDateTime::fromString(object["date"].toString()), Qt::LocalTime);
+        alarm.originalDate = alarm.date = QDateTime::fromString(object["date"].toString());
         alarm.sound = object["sound"].toString();
         alarm.type = static_cast<UCAlarm::AlarmType>(object["type"].toInt());
         alarm.days = static_cast<UCAlarm::DaysOfWeek>(object["days"].toInt());
@@ -158,7 +159,7 @@
     Q_FOREACH(const AlarmData &alarm, alarmList) {
         QJsonObject object;
         object["message"] = alarm.message;
-        object["date"] = AlarmData::transcodeDate(alarm.originalDate, Qt::UTC).toString();
+        object["date"] = alarm.originalDate.toString();
         object["sound"] = alarm.sound.toString();
         object["type"] = QJsonValue(alarm.type);
         object["days"] = QJsonValue(alarm.days);
@@ -181,7 +182,12 @@
     event.setCollectionId(collection.id());
     event.setAllDay(false);
     if (alarm.changes & AlarmData::Date) {
-        event.setStartDateTime(AlarmData::transcodeDate(alarm.date, Qt::UTC));
+        QDateTime dt = AlarmData::normalizeDate(alarm.date);
+        // use invalid timezone to sinalize floating time, this is valid only for EDS backend
+        if (manager->managerName() == ALARM_MANAGER) {
+            dt = QDateTime(dt.date(), dt.time(), QTimeZone());
+        }
+        event.setStartDateTime(dt);
     }
     if (alarm.changes & AlarmData::Message) {
         event.setDisplayLabel(alarm.message);
@@ -195,7 +201,11 @@
         event.saveDetail(&visual);
     }
     QOrganizerItemAudibleReminder audible = event.detail(QOrganizerItemDetail::TypeAudibleReminder);
-    if (audible.isEmpty()) {
+    if (audible.dataUrl() != alarm.sound) {
+        if (!audible.isEmpty()) {
+            // remove previous attachment
+            event.removeDetail(&audible);
+        }
         audible.setSecondsBeforeStart(0);
         audible.setDataUrl(alarm.sound);
         event.saveDetail(&audible);
@@ -213,20 +223,6 @@
         }
     }
 
-    // save the sound as description as the audible reminder may be off
-    if (alarm.changes && AlarmData::Sound) {
-        event.setDescription(alarm.sound.toString());
-        // update audible reminder as well if alarm is enabled
-        if (alarm.enabled) {
-            QOrganizerItemAudibleReminder audible = event.detail(QOrganizerItemDetail::TypeAudibleReminder);
-            // remove the previous data, otherwise we will have two melodies
-            event.removeDetail(&audible);
-            // update sound and save
-            audible.setDataUrl(alarm.sound);
-            event.saveDetail(&audible);
-        }
-    }
-
     // set repeating, reset recurrence no matter if we had it or not
     if (((alarm.changes & AlarmData::Type) == AlarmData::Type)
             || ((alarm.changes & AlarmData::Days) == AlarmData::Days)) {
@@ -261,8 +257,9 @@
 
     alarm.cookie = QVariant::fromValue<QOrganizerItemId>(event.id());
     alarm.message = event.displayLabel();
-    alarm.date = AlarmData::transcodeDate(event.startDateTime().toUTC(), Qt::LocalTime);
-    alarm.sound = QUrl(event.description());
+    alarm.date = AlarmData::transcodeDate(event.startDateTime(), Qt::LocalTime);
+    QOrganizerItemAudibleReminder audible = event.detail(QOrganizerItemDetail::TypeAudibleReminder);
+    alarm.sound = audible.dataUrl();
     alarm.originalDate = alarm.date;
 
     // check if the alarm is enabled or not
@@ -341,13 +338,6 @@
             if (value.toBool()) {
                 return !todo.tags().contains(tagDisabledAlarm) && todo.tags().contains(tagAlarmService);
             } else {
-                // check if we have the attachments still
-                QOrganizerItemVisualReminder visual = todo.detail(QOrganizerItemDetail::TypeVisualReminder);
-                QOrganizerItemAudibleReminder audible = todo.detail(QOrganizerItemDetail::TypeAudibleReminder);
-                if (visual.isEmpty() || audible.isEmpty()) {
-                    // we don't, return failure
-                    return false;
-                }
                 return todo.tags().contains(tagDisabledAlarm) && todo.tags().contains(tagAlarmService);
             }
         }
@@ -361,14 +351,9 @@
         }
         case AlarmData::Sound:
         {
-            // it is enough to check teh audible presence, as they are added/removed in pair with visual reminder
+            // it is enough to check the audible presence, as they are added/removed in pair with visual reminder
             QOrganizerItemAudibleReminder audible = todo.detail(QOrganizerItemDetail::TypeAudibleReminder);
-            bool result = todo.description() == value.toString();
-            if (result && !audible.isEmpty()) {
-                // check whether the reminder has the same sound
-                result = audible.dataUrl().toString() == value.toString();
-            }
-            return result;
+            return audible.dataUrl().toString() == value.toString();
         }
         case AlarmData::Type:
         {
@@ -415,7 +400,14 @@
     return adapter->fetch();
 }
 
-void AlarmsAdapter::updateAlarms(QList<QOrganizerItemId> list)
+bool AlarmsAdapter::compareCookies(const QVariant &cookie1, const QVariant &cookie2)
+{
+    QOrganizerItemId id1 = cookie1.value<QOrganizerItemId>();
+    QOrganizerItemId id2 = cookie2.value<QOrganizerItemId>();
+    return id1 == id2;
+}
+
+void AlarmsAdapter::updateAlarms(const QList<QOrganizerItemId> &list)
 {
     if (list.size() < 0) {
         return;
@@ -443,7 +435,8 @@
         QVariant cookie = QVariant::fromValue<QOrganizerItemId>(event.id());
         int index = alarmList.indexOfAlarm(cookie);
         if (index < 0) {
-            qFatal("The Alarm data has been updated with an unregistered item!");
+            qCritical("The Alarm data has been updated with an unregistered item, skipping!");
+            continue;
         }
         AlarmData data = alarmList[index];
         if (alarmDataFromOrganizerEvent(event, data) == UCAlarm::NoError) {
@@ -512,10 +505,6 @@
         endDate = startDate.addDays(8);
     }
 
-    // transcode both dates
-    startDate = AlarmData::transcodeDate(startDate, Qt::UTC);
-    endDate = AlarmData::transcodeDate(endDate, Qt::UTC);
-
     QList<QOrganizerItem> occurrences = manager->itemOccurrences(event, startDate, endDate, 10);
     // get the first occurrence and use the date from it
     if ((occurrences.length() > 0) && (occurrences[0].type() == QOrganizerItemType::TypeTodoOccurrence)) {
@@ -525,7 +514,7 @@
             // check if the date is after the current datetime
             // the first occurrence is the one closest to the currentDate, therefore we can safely
             // set that startDate to the alarm
-            alarm.date = AlarmData::transcodeDate(occurrence.startDateTime().toUTC(), Qt::LocalTime);
+            alarm.date = AlarmData::transcodeDate(occurrence.startDateTime(), Qt::LocalTime);
             if (alarm.date > currentDate) {
                 // we have the proper date set, leave
                 break;
@@ -587,13 +576,9 @@
         return false;
     }
 
-    QOrganizerTodo event;
-    AlarmsAdapter::get()->organizerEventFromAlarmData(alarm, event);
-    event.setId(alarm.cookie.value<QOrganizerItemId>());
-
-    QOrganizerItemRemoveRequest *operation = new QOrganizerItemRemoveRequest(q_ptr);
+    QOrganizerItemRemoveByIdRequest *operation = new QOrganizerItemRemoveByIdRequest(q_ptr);
     operation->setManager(AlarmsAdapter::get()->manager);
-    operation->setItem(event);
+    operation->setItemId(alarm.cookie.value<QOrganizerItemId>());
     AlarmsAdapter::get()->listDirty = true;
     return start(operation);
 }
@@ -644,7 +629,7 @@
     completed = false;
     // make sure we are in progress state
     setStatus(requestTypeToOperation(), AlarmRequest::InProgress);
-    QObject::connect(m_request, SIGNAL(resultsAvailable()), q_ptr, SLOT(_q_updateProgress()));
+    QObject::connect(m_request, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), q_ptr, SLOT(_q_updateProgress()));
     if (m_request->start()) {
         // check if the request got completed without having the slot called (some engines may do that)
         if (!completed && m_request->state() >= QOrganizerAbstractRequest::CanceledState) {
@@ -661,11 +646,11 @@
 void AlarmRequestAdapter::_q_updateProgress()
 {
     completed = true;
-
     QOrganizerAbstractRequest::State state = m_request->state();
     AlarmRequest::Operation opCode = requestTypeToOperation();
     switch (state) {
     case QOrganizerAbstractRequest::InactiveState: {
+        completed = false;
         setStatus(opCode, AlarmRequest::Ready);
         break;
     }
@@ -730,7 +715,7 @@
     case QOrganizerAbstractRequest::ItemSaveRequest: {
         return AlarmRequest::Saving;
     }
-    case QOrganizerAbstractRequest::ItemRemoveRequest: {
+    case QOrganizerAbstractRequest::ItemRemoveByIdRequest: {
         return AlarmRequest::Canceling;
     }
     case QOrganizerAbstractRequest::ItemFetchRequest: {

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2014-09-04 13:47:03 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2014-10-16 12:58:00 +0000
@@ -90,10 +90,11 @@
     void daysFromSet(AlarmData &alarm, QSet<Qt::DayOfWeek> set);
 
     bool verifyChange(const QVariant &cookie, AlarmData::Change change, const QVariant &value);
+    bool compareCookies(const QVariant &cookie1, const QVariant &cookie2);
 
 public Q_SLOTS:
     bool fetchAlarms();
-    void updateAlarms(QList<QOrganizerItemId> list);
+    void updateAlarms(const QList<QOrganizerItemId> &list);
 
 protected:
     AlarmRequest *fetchRequest;

=== modified file 'modules/Ubuntu/Components/plugin/alarmmanager_p.cpp'
--- modules/Ubuntu/Components/plugin/alarmmanager_p.cpp	2014-09-04 13:47:03 +0000
+++ modules/Ubuntu/Components/plugin/alarmmanager_p.cpp	2014-10-16 12:58:00 +0000
@@ -66,5 +66,10 @@
     return d->verifyChange(pAlarm->rawData.cookie, change, newData);
 }
 
+bool AlarmManager::compareCookies(const QVariant &cookie1, const QVariant &cookie2)
+{
+    Q_D(AlarmManager);
+    return d->compareCookies(cookie1, cookie2);
+}
 
 #include "moc_alarmmanager_p.cpp"

=== modified file 'modules/Ubuntu/Components/plugin/alarmmanager_p.h'
--- modules/Ubuntu/Components/plugin/alarmmanager_p.h	2014-09-04 13:47:03 +0000
+++ modules/Ubuntu/Components/plugin/alarmmanager_p.h	2014-10-16 12:58:00 +0000
@@ -123,26 +123,9 @@
     bool enabled;
 };
 
-// list of alarms
-class AlarmList: public QList<AlarmData>
-{
-public:
-    AlarmList(){}
-
-    // returns the index of the alarm matching a cookie, -1 on error
-    inline int indexOfAlarm(const QVariant &cookie)
-    {
-        for (int i = 0; i < size(); i++) {
-            if (at(i).cookie == cookie) {
-                return i;
-            }
-        }
-        return -1;
-    }
-};
-
 class AlarmRequest;
 class AlarmManagerPrivate;
+class AlarmList;
 class AlarmManager : public QObject
 {
     Q_OBJECT
@@ -160,6 +143,7 @@
     AlarmList alarms() const;
 
     bool verifyChange(UCAlarm *alarm, AlarmData::Change change, const QVariant &newData);
+    bool compareCookies(const QVariant &cookie1, const QVariant &cookie2);
 
 Q_SIGNALS:
     void alarmsChanged();
@@ -172,4 +156,22 @@
     QScopedPointer<AlarmManagerPrivate> d_ptr;
 };
 
+// list of alarms
+class AlarmList: public QList<AlarmData>
+{
+public:
+    AlarmList(){}
+
+    // returns the index of the alarm matching a cookie, -1 on error
+    inline int indexOfAlarm(const QVariant &cookie)
+    {
+        for (int i = 0; i < size(); i++) {
+            if (AlarmManager::instance().compareCookies(at(i).cookie, cookie)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+};
+
 #endif // ALARMMANAGER_H

=== modified file 'modules/Ubuntu/Components/plugin/alarmmanager_p_p.h'
--- modules/Ubuntu/Components/plugin/alarmmanager_p_p.h	2014-09-04 13:47:03 +0000
+++ modules/Ubuntu/Components/plugin/alarmmanager_p_p.h	2014-10-16 12:58:00 +0000
@@ -44,6 +44,8 @@
 
     virtual bool fetchAlarms() = 0;
 
+    virtual bool compareCookies(const QVariant &cookie1, const QVariant &cookie2) = 0;
+
     // function to verify whether the given alarm property has a given value set
     // used for testing purposes
     virtual bool verifyChange(const QVariant &cookie, AlarmData::Change change, const QVariant &value) = 0;

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-09-07 16:42:47 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-10-16 12:58:00 +0000
@@ -35,7 +35,6 @@
 #include "inversemouseareatype.h"
 #include "qquickclipboard.h"
 #include "qquickmimedata.h"
-#include "thumbnailgenerator.h"
 #include "ucubuntuanimation.h"
 #include "ucfontutils.h"
 #include "ucarguments.h"
@@ -214,12 +213,6 @@
     // register icon provider
     engine->addImageProvider(QLatin1String("theme"), new UnityThemeIconProvider);
 
-    try {
-        engine->addImageProvider(QLatin1String("thumbnailer"), new ThumbnailGenerator);
-    } catch(std::runtime_error &e) {
-        qDebug() << "Could not create thumbnailer: " << e.what();
-    }
-
     // Necessary for Screen.orientation (from import QtQuick.Window 2.0) to work
     QGuiApplication::primaryScreen()->setOrientationUpdateMask(
             Qt::PortraitOrientation |

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-09-07 16:42:47 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2014-10-16 12:58:00 +0000
@@ -1,6 +1,6 @@
 unix {
     CONFIG += link_pkgconfig
-    PKGCONFIG += gio-2.0 thumbnailer dbus-1 libnih-dbus
+    PKGCONFIG += gio-2.0 dbus-1 libnih-dbus
 }
 
 TEMPLATE = lib
@@ -50,7 +50,6 @@
     alarmmanager_p.h \
     ucalarmmodel.h \
     unitythemeiconprovider.h \
-    thumbnailgenerator.h \
     alarmrequest_p.h \
     alarmrequest_p_p.h \
     adapters/alarmsadapter_p.h \
@@ -93,7 +92,6 @@
     alarmmanager_p.cpp \
     ucalarmmodel.cpp \
     unitythemeiconprovider.cpp \
-    thumbnailgenerator.cpp \
     alarmrequest_p.cpp \
     ucstatesaver.cpp \
     sortbehavior.cpp \

=== removed file 'modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp'
--- modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	2014-05-27 14:07:00 +0000
+++ modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright 2013 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/>.
- *
- * Authors: Jussi Pakkanen <[e-mail]>
-*/
-
-#include "thumbnailgenerator.h"
-#include <stdexcept>
-#include <QDebug>
-#include <QMimeDatabase>
-#include <QUrl>
-
-const char *DEFAULT_VIDEO_ART = "/usr/share/unity/icons/video_missing.png";
-const char *DEFAULT_ALBUM_ART = "/usr/share/unity/icons/album_missing.png";
-
-ThumbnailGenerator::ThumbnailGenerator() : QQuickImageProvider(QQuickImageProvider::Image,
-        QQmlImageProviderBase::ForceAsynchronousImageLoading) {
-
-}
-
-QImage ThumbnailGenerator::requestImage(const QString &id, QSize *realSize,
-        const QSize &requestedSize) {
-    /* Allow appending a query string (e.g. ?something=timestamp)
-     * to the id and then ignore it.
-     * This is workaround to force reloading a thumbnail when it has
-     * the same file name on disk but we know the content has changed.
-     * It is necessary because in such a situation the QML image cache
-     * will kick in and this ImageProvider will never get called.
-     * The only "solution" is setting Image.cache = false, but in some
-     * cases we don't want to do that for performance reasons, so this
-     * is the only way around the issue for now. */
-    std::string src_path(QUrl(id).path().toUtf8().data());
-    std::string tgt_path;
-    const int xlarge_cutoff = 512;
-    const int large_cutoff = 256;
-    const int small_cutoff = 128;
-    try {
-        ThumbnailSize desiredSize;
-        if(requestedSize.width() > xlarge_cutoff || requestedSize.height() > xlarge_cutoff) {
-            desiredSize = TN_SIZE_ORIGINAL;
-        } else if(requestedSize.width() > large_cutoff || requestedSize.height() > large_cutoff) {
-            desiredSize = TN_SIZE_XLARGE;
-        } else if(requestedSize.width() > small_cutoff || requestedSize.height() > small_cutoff) {
-            desiredSize = TN_SIZE_LARGE;
-        } else {
-            desiredSize = TN_SIZE_SMALL;
-        }
-        tgt_path = tn.get_thumbnail(src_path, desiredSize);
-        if(!tgt_path.empty()) {
-            QString tgt(tgt_path.c_str());
-            QImage image;
-            image.load(tgt);
-            *realSize = image.size();
-            return image;
-        }
-    } catch(std::runtime_error &e) {
-        qDebug() << "Thumbnail generator failed: " << e.what();
-    }
-    return getFallbackImage(id, realSize, requestedSize);
-}
-
-QImage ThumbnailGenerator::getFallbackImage(const QString &id, QSize *size,
-        const QSize &requestedSize) {
-    Q_UNUSED(requestedSize);
-    QMimeDatabase db;
-    QMimeType mime = db.mimeTypeForFile(id);
-    QImage result;
-    if(mime.name().contains("audio")) {
-        result.load(DEFAULT_ALBUM_ART);
-    } else if(mime.name().contains("video")) {
-        result.load(DEFAULT_VIDEO_ART);
-    }
-    *size = result.size();
-    return result;
-}

=== removed file 'modules/Ubuntu/Components/plugin/thumbnailgenerator.h'
--- modules/Ubuntu/Components/plugin/thumbnailgenerator.h	2013-10-10 10:56:22 +0000
+++ modules/Ubuntu/Components/plugin/thumbnailgenerator.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright 2013 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/>.
- *
- * Authors: Jussi Pakkanen <[e-mail]>
-*/
-
-#ifndef THUMBNAIL_GENERATOR_H
-#define THUMBNAIL_GENERATOR_H
-
-#include <QQuickImageProvider>
-#include <thumbnailer.h>
-
-class ThumbnailGenerator: public QQuickImageProvider
-{
-private:
-    Thumbnailer tn;
-
-public:
-    ThumbnailGenerator();
-    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
-    QImage getFallbackImage(const QString &id, QSize *size, const QSize &requestedSize);
-};
-
-#endif

=== modified file 'modules/Ubuntu/Components/plugin/ucactioncontext.h'
--- modules/Ubuntu/Components/plugin/ucactioncontext.h	2014-09-16 07:49:07 +0000
+++ modules/Ubuntu/Components/plugin/ucactioncontext.h	2014-10-16 12:58:00 +0000
@@ -27,6 +27,7 @@
 class UCActionContext : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QQmlListProperty<QObject> actions READ actions)
     Q_PROPERTY(bool active MEMBER m_active WRITE setActive NOTIFY activeChanged)
     Q_CLASSINFO("DefaultProperty", "actions")

=== modified file 'modules/Ubuntu/Components/plugin/ucactionmanager.h'
--- modules/Ubuntu/Components/plugin/ucactionmanager.h	2014-09-16 07:49:07 +0000
+++ modules/Ubuntu/Components/plugin/ucactionmanager.h	2014-10-16 12:58:00 +0000
@@ -26,6 +26,7 @@
 class UCActionManager : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QQmlListProperty<QObject> actions READ actions)
     Q_PROPERTY(QQmlListProperty<QObject> localContexts READ localContexts)
     Q_PROPERTY(UCActionContext *globalContext READ globalContext CONSTANT)

=== modified file 'modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp'
--- modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2014-09-18 09:29:49 +0000
+++ modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2014-10-16 12:58:00 +0000
@@ -65,7 +65,7 @@
             }
         }
 
-        if (constrainedSize.isValid()) {
+        if (!constrainedSize.isEmpty()) {
             imageReader.setScaledSize(constrainedSize);
         } else if (scaledSize != realSize) {
             imageReader.setScaledSize(scaledSize);

=== modified file 'modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.cpp'
--- modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.cpp	2014-02-11 17:40:02 +0000
+++ modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.cpp	2014-10-16 12:58:00 +0000
@@ -20,14 +20,67 @@
 #include <QtGui/QOpenGLContext>
 #include "rendertimer.h"
 
+#if defined(QT_OPENGL_ES)
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#endif
+
 #if !defined(GL_TIME_ELAPSED)
 #define GL_TIME_ELAPSED 0x88BF
 #endif
 
+class RenderTimerPrivate
+{
+public:
+
+    RenderTimerPrivate() :
+        m_type(RenderTimer::Trivial)
+    { }
+
+    RenderTimer::TimerType m_type;
+    QElapsedTimer m_trivialTimer;
+
+#if defined(QT_OPENGL_ES)
+    struct {
+        void (QOPENGLF_APIENTRYP genFencesNV)(GLsizei n, GLuint* fences);
+        void (QOPENGLF_APIENTRYP deleteFencesNV)(GLsizei n, const GLuint* fences);
+        void (QOPENGLF_APIENTRYP setFenceNV)(GLuint fence, GLenum condition);
+        void (QOPENGLF_APIENTRYP finishFenceNV)(GLuint fence);
+    } m_fenceNV;
+    GLuint m_fence[2];
+
+    struct {
+        EGLSyncKHR (QOPENGLF_APIENTRYP createSyncKHR)(EGLDisplay dpy, EGLenum type,
+                                                      const EGLint* attrib_list);
+        EGLBoolean (QOPENGLF_APIENTRYP destroySyncKHR)(EGLDisplay dpy, EGLSyncKHR sync);
+        EGLint (QOPENGLF_APIENTRYP clientWaitSyncKHR)(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags,
+                                                      EGLTimeKHR timeout);
+    } m_fenceSyncKHR;
+    EGLSyncKHR m_beforeSync;
+#else
+    struct {
+        void (QOPENGLF_APIENTRYP genQueries)(GLsizei n, GLuint* ids);
+        void (QOPENGLF_APIENTRYP deleteQueries)(GLsizei n, const GLuint* ids);
+        void (QOPENGLF_APIENTRYP beginQuery)(GLenum target, GLuint id);
+        void (QOPENGLF_APIENTRYP endQuery)(GLenum target);
+        void (QOPENGLF_APIENTRYP getQueryObjectui64v)(GLuint id, GLenum pname, GLuint64* params);
+        void (QOPENGLF_APIENTRYP getQueryObjectui64vExt)(GLuint id, GLenum pname, GLuint64EXT* params);
+        void (QOPENGLF_APIENTRYP queryCounter)(GLuint id, GLenum target);
+    } m_timerQuery;
+    enum { TimerQueryUnavailable, TimerQueryCore, TimerQueryExt } m_timerQueryVersion;
+    GLuint m_timer[2];
+#endif
+};
+
 RenderTimer::RenderTimer(QObject* parent) :
-    QObject(parent),
-    m_type(RenderTimer::Trivial)
-{
+    QObject(parent)
+{
+    d_ptr = new RenderTimerPrivate;
+}
+
+RenderTimer::~RenderTimer()
+{
+    delete d_ptr;
 }
 
 bool RenderTimer::isAvailable(TimerType type)
@@ -89,132 +142,136 @@
 
 void RenderTimer::setup(TimerType type)
 {
+    Q_D(RenderTimer);
     if (type == RenderTimer::Automatic) {
         type = RenderTimer::optimalTimerType();
     }
 
-    m_type = type;
+    d->m_type = type;
 
-    if (m_type == RenderTimer::Trivial) {
+    if (d->m_type == RenderTimer::Trivial) {
 #if defined(QT_OPENGL_ES)
-    } else if (m_type == RenderTimer::KHRFence) {
-        m_fenceSyncKHR.createSyncKHR = reinterpret_cast<
+    } else if (d->m_type == RenderTimer::KHRFence) {
+        d->m_fenceSyncKHR.createSyncKHR = reinterpret_cast<
             EGLSyncKHR (QOPENGLF_APIENTRYP)(EGLDisplay, EGLenum, const EGLint*)>(
             eglGetProcAddress("eglCreateSyncKHR"));
-        m_fenceSyncKHR.destroySyncKHR = reinterpret_cast<
+        d->m_fenceSyncKHR.destroySyncKHR = reinterpret_cast<
             EGLBoolean (QOPENGLF_APIENTRYP)(EGLDisplay, EGLSyncKHR)>(
             eglGetProcAddress("eglDestroySyncKHR"));
-        m_fenceSyncKHR.clientWaitSyncKHR = reinterpret_cast<
+        d->m_fenceSyncKHR.clientWaitSyncKHR = reinterpret_cast<
             EGLint (QOPENGLF_APIENTRYP)(EGLDisplay, EGLSyncKHR, EGLint, EGLTimeKHR)>(
             eglGetProcAddress("eglClientWaitSyncKHR"));
 
-    } else if (m_type == RenderTimer::NVFence) {
-        m_fenceNV.genFencesNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, GLuint*)>(
+    } else if (d->m_type == RenderTimer::NVFence) {
+        d->m_fenceNV.genFencesNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, GLuint*)>(
             eglGetProcAddress("glGenFencesNV"));
-        m_fenceNV.deleteFencesNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, const GLuint*)>(
+        d->m_fenceNV.deleteFencesNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, const GLuint*)>(
             eglGetProcAddress("glDeleteFencesNV"));
-        m_fenceNV.setFenceNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint, GLenum)>(
+        d->m_fenceNV.setFenceNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint, GLenum)>(
             eglGetProcAddress("glSetFenceNV"));
-        m_fenceNV.finishFenceNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint)>(
+        d->m_fenceNV.finishFenceNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint)>(
             eglGetProcAddress("glFinishFenceNV"));
-        m_fenceNV.genFencesNV(2, m_fence);
+        d->m_fenceNV.genFencesNV(2, d->m_fence);
 #else
-    } else if (m_type == RenderTimer::ARBTimerQuery) {
+    } else if (d->m_type == RenderTimer::ARBTimerQuery) {
         QOpenGLContext* context = QOpenGLContext::currentContext();
-        m_timerQuery.genQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, GLuint*)>(
+        d->m_timerQuery.genQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, GLuint*)>(
             context->getProcAddress("glGenQueries"));
-        m_timerQuery.deleteQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, const GLuint*)>(
+        d->m_timerQuery.deleteQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, const GLuint*)>(
             context->getProcAddress("glDeleteQueries"));
-        m_timerQuery.getQueryObjectui64v =
+        d->m_timerQuery.getQueryObjectui64v =
         reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint, GLenum, GLuint64*)>(
             context->getProcAddress("glGetQueryObjectui64v"));
-        m_timerQuery.queryCounter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint, GLenum)>(
+        d->m_timerQuery.queryCounter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint, GLenum)>(
             context->getProcAddress("glQueryCounter"));
-        m_timerQueryVersion = TimerQueryCore;
-        m_timerQuery.genQueries(2, m_timer);
+        d->m_timerQueryVersion = RenderTimerPrivate::TimerQueryCore;
+        d->m_timerQuery.genQueries(2, d->m_timer);
 
-    } else if (m_type == RenderTimer::EXTTimerQuery) {
+    } else if (d->m_type == RenderTimer::EXTTimerQuery) {
         QOpenGLContext* context = QOpenGLContext::currentContext();
-        m_timerQuery.genQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, GLuint*)>(
+        d->m_timerQuery.genQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, GLuint*)>(
             context->getProcAddress("glGenQueries"));
-        m_timerQuery.deleteQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, const GLuint*)>(
+        d->m_timerQuery.deleteQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei, const GLuint*)>(
             context->getProcAddress("glDeleteQueries"));
-        m_timerQuery.beginQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLuint)>(
+        d->m_timerQuery.beginQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLuint)>(
             context->getProcAddress("glBeginQuery"));
-        m_timerQuery.endQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum)>(
+        d->m_timerQuery.endQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum)>(
             context->getProcAddress("glEndQuery"));
-        m_timerQuery.getQueryObjectui64vExt =
+        d->m_timerQuery.getQueryObjectui64vExt =
         reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint, GLenum, GLuint64EXT*)>(
             context->getProcAddress("glGetQueryObjectui64vEXT"));
-        m_timerQueryVersion = TimerQueryExt;
-        m_timerQuery.genQueries(1, m_timer);
+        d->m_timerQueryVersion = RenderTimerPrivate::TimerQueryExt;
+        d->m_timerQuery.genQueries(1, d->m_timer);
 #endif
     }
 }
 
 void RenderTimer::teardown()
 {
-    teardown(m_type);
+    teardown(d_ptr->m_type);
 }
 
 void RenderTimer::teardown(TimerType type)
 {
+    Q_D(RenderTimer);
     if (type == RenderTimer::Trivial) {
 #if defined(QT_OPENGL_ES)
     } else if (type == RenderTimer::KHRFence) {
-        if (m_beforeSync != EGL_NO_SYNC_KHR) {
-            m_fenceSyncKHR.destroySyncKHR(eglGetCurrentDisplay(), m_beforeSync);
+        if (d->m_beforeSync != EGL_NO_SYNC_KHR) {
+            d->m_fenceSyncKHR.destroySyncKHR(eglGetCurrentDisplay(), d->m_beforeSync);
         }
 
     } else if (type == RenderTimer::NVFence) {
-        m_fenceNV.deleteFencesNV(2, m_fence);
+        d->m_fenceNV.deleteFencesNV(2, d->m_fence);
 #else
     } else if (type == RenderTimer::ARBTimerQuery) {
-        m_timerQuery.deleteQueries(2, m_timer);
+        d->m_timerQuery.deleteQueries(2, d->m_timer);
 
     } else if (type == RenderTimer::EXTTimerQuery) {
-        m_timerQuery.deleteQueries(1, m_timer);
+        d->m_timerQuery.deleteQueries(1, d->m_timer);
 #endif
     }
 }
 
 void RenderTimer::start()
 {
-    if (m_type == RenderTimer::Trivial) {
-        m_trivialTimer.start();
+    Q_D(RenderTimer);
+    if (d->m_type == RenderTimer::Trivial) {
+        d-> m_trivialTimer.start();
 #if defined(QT_OPENGL_ES)
-    } else if (m_type == RenderTimer::KHRFence) {
-        m_beforeSync = m_fenceSyncKHR.createSyncKHR(eglGetCurrentDisplay(), EGL_SYNC_FENCE_KHR, NULL);
+    } else if (d->m_type == RenderTimer::KHRFence) {
+        d->m_beforeSync = d->m_fenceSyncKHR.createSyncKHR(eglGetCurrentDisplay(), EGL_SYNC_FENCE_KHR, NULL);
 
-    } else if (m_type == RenderTimer::NVFence) {
-        m_fenceNV.setFenceNV(m_fence[0], GL_ALL_COMPLETED_NV);
+    } else if (d->m_type == RenderTimer::NVFence) {
+        d->m_fenceNV.setFenceNV(d->m_fence[0], GL_ALL_COMPLETED_NV);
 #else
-    } else if (m_type == RenderTimer::ARBTimerQuery) {
-        m_timerQuery.queryCounter(m_timer[0], GL_TIMESTAMP);
+    } else if (d->m_type == RenderTimer::ARBTimerQuery) {
+        d->m_timerQuery.queryCounter(d->m_timer[0], GL_TIMESTAMP);
 
-    } else if (m_type == RenderTimer::EXTTimerQuery) {
-        m_timerQuery.beginQuery(GL_TIME_ELAPSED, m_timer[0]);
+    } else if (d->m_type == RenderTimer::EXTTimerQuery) {
+        d->m_timerQuery.beginQuery(GL_TIME_ELAPSED, d->m_timer[0]);
 #endif
     }
 }
 
 qint64 RenderTimer::stop()
 {
-    if (m_type == RenderTimer::Trivial) {
+    Q_D(RenderTimer);
+    if (d->m_type == RenderTimer::Trivial) {
         glFinish();
-        return m_trivialTimer.nsecsElapsed();
+        return d-> m_trivialTimer.nsecsElapsed();
 #if defined(QT_OPENGL_ES)
-    } else if (m_type == RenderTimer::KHRFence) {
+    } else if (d->m_type == RenderTimer::KHRFence) {
         QElapsedTimer timer;
         EGLDisplay dpy = eglGetCurrentDisplay();
-        EGLSyncKHR afterSync = m_fenceSyncKHR.createSyncKHR(dpy, EGL_SYNC_FENCE_KHR, NULL);
-        EGLint beforeSyncValue = m_fenceSyncKHR.clientWaitSyncKHR(dpy, m_beforeSync, 0, EGL_FOREVER_KHR);
+        EGLSyncKHR afterSync = d->m_fenceSyncKHR.createSyncKHR(dpy, EGL_SYNC_FENCE_KHR, NULL);
+        EGLint beforeSyncValue = d->m_fenceSyncKHR.clientWaitSyncKHR(dpy, d->m_beforeSync, 0, EGL_FOREVER_KHR);
         qint64 beforeTime = timer.nsecsElapsed();
-        EGLint afterSyncValue = m_fenceSyncKHR.clientWaitSyncKHR(dpy, afterSync, 0, EGL_FOREVER_KHR);
+        EGLint afterSyncValue = d->m_fenceSyncKHR.clientWaitSyncKHR(dpy, afterSync, 0, EGL_FOREVER_KHR);
         qint64 afterTime = timer.nsecsElapsed();
-        m_fenceSyncKHR.destroySyncKHR(dpy, afterSync);
-        m_fenceSyncKHR.destroySyncKHR(dpy, m_beforeSync);
-        m_beforeSync = EGL_NO_SYNC_KHR;
+        d->m_fenceSyncKHR.destroySyncKHR(dpy, afterSync);
+        d->m_fenceSyncKHR.destroySyncKHR(dpy, d->m_beforeSync);
+        d->m_beforeSync = EGL_NO_SYNC_KHR;
         if (beforeSyncValue == EGL_CONDITION_SATISFIED_KHR
         && afterSyncValue == EGL_CONDITION_SATISFIED_KHR) {
             return afterTime - beforeTime;
@@ -222,30 +279,30 @@
             return -1;
         }
 
-    } else if (m_type == RenderTimer::NVFence) {
+    } else if (d->m_type == RenderTimer::NVFence) {
         QElapsedTimer timer;
-        m_fenceNV.setFenceNV(m_fence[1], GL_ALL_COMPLETED_NV);
-        m_fenceNV.finishFenceNV(m_fence[0]);
+        d->m_fenceNV.setFenceNV(d->m_fence[1], GL_ALL_COMPLETED_NV);
+        d->m_fenceNV.finishFenceNV(d->m_fence[0]);
         qint64 beforeTime = timer.nsecsElapsed();
-        m_fenceNV.finishFenceNV(m_fence[1]);
+        d->m_fenceNV.finishFenceNV(d->m_fence[1]);
         qint64 afterTime = timer.nsecsElapsed();
         return afterTime - beforeTime;
 #else
-    } else if (m_type == RenderTimer::ARBTimerQuery) {
+    } else if (d->m_type == RenderTimer::ARBTimerQuery) {
         GLuint64 time[2] = { 0, 0 };
-        m_timerQuery.queryCounter(m_timer[1], GL_TIMESTAMP);
-        m_timerQuery.getQueryObjectui64v(m_timer[0], GL_QUERY_RESULT, &time[0]);
-        m_timerQuery.getQueryObjectui64v(m_timer[1], GL_QUERY_RESULT, &time[1]);
+        d->m_timerQuery.queryCounter(d->m_timer[1], GL_TIMESTAMP);
+        d->m_timerQuery.getQueryObjectui64v(d->m_timer[0], GL_QUERY_RESULT, &time[0]);
+        d->m_timerQuery.getQueryObjectui64v(d->m_timer[1], GL_QUERY_RESULT, &time[1]);
         if (time[0] != 0 && time[1] != 0) {
             return time[1] - time[0];
         } else {
             return -1;
         }
 
-    } else if (m_type == RenderTimer::EXTTimerQuery) {
+    } else if (d->m_type == RenderTimer::EXTTimerQuery) {
         GLuint64EXT time;
-        m_timerQuery.endQuery(GL_TIME_ELAPSED);
-        m_timerQuery.getQueryObjectui64vExt(m_timer[0], GL_QUERY_RESULT, &time);
+        d->m_timerQuery.endQuery(GL_TIME_ELAPSED);
+        d->m_timerQuery.getQueryObjectui64vExt(d->m_timer[0], GL_QUERY_RESULT, &time);
         return static_cast<qint64>(time);
 #endif
     }

=== modified file 'modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.h'
--- modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.h	2014-02-11 17:40:02 +0000
+++ modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.h	2014-10-16 12:58:00 +0000
@@ -24,10 +24,7 @@
 #include <QtCore/QElapsedTimer>
 #include <QtGui/qopenglfunctions.h>
 
-#if defined(QT_OPENGL_ES)
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#endif
+class RenderTimerPrivate;
 
 class RenderTimer : public QObject
 {
@@ -49,6 +46,7 @@
     };
 
     explicit RenderTimer(QObject* parent = 0);
+    virtual ~RenderTimer();
 
     static bool isAvailable(TimerType type);
     static TimerType optimalTimerType();
@@ -61,39 +59,8 @@
     void teardown(TimerType type);
 
 private:
-    TimerType m_type;
-    QElapsedTimer m_trivialTimer;
-
-#if defined(QT_OPENGL_ES)
-    struct {
-        void (QOPENGLF_APIENTRYP genFencesNV)(GLsizei n, GLuint* fences);
-        void (QOPENGLF_APIENTRYP deleteFencesNV)(GLsizei n, const GLuint* fences);
-        void (QOPENGLF_APIENTRYP setFenceNV)(GLuint fence, GLenum condition);
-        void (QOPENGLF_APIENTRYP finishFenceNV)(GLuint fence);
-    } m_fenceNV;
-    GLuint m_fence[2];
-
-    struct {
-        EGLSyncKHR (QOPENGLF_APIENTRYP createSyncKHR)(EGLDisplay dpy, EGLenum type,
-                                                      const EGLint* attrib_list);
-        EGLBoolean (QOPENGLF_APIENTRYP destroySyncKHR)(EGLDisplay dpy, EGLSyncKHR sync);
-        EGLint (QOPENGLF_APIENTRYP clientWaitSyncKHR)(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags,
-                                                      EGLTimeKHR timeout);
-    } m_fenceSyncKHR;
-    EGLSyncKHR m_beforeSync;
-#else
-    struct {
-        void (QOPENGLF_APIENTRYP genQueries)(GLsizei n, GLuint* ids);
-        void (QOPENGLF_APIENTRYP deleteQueries)(GLsizei n, const GLuint* ids);
-        void (QOPENGLF_APIENTRYP beginQuery)(GLenum target, GLuint id);
-        void (QOPENGLF_APIENTRYP endQuery)(GLenum target);
-        void (QOPENGLF_APIENTRYP getQueryObjectui64v)(GLuint id, GLenum pname, GLuint64* params);
-        void (QOPENGLF_APIENTRYP getQueryObjectui64vExt)(GLuint id, GLenum pname, GLuint64EXT* params);
-        void (QOPENGLF_APIENTRYP queryCounter)(GLuint id, GLenum target);
-    } m_timerQuery;
-    enum { TimerQueryUnavailable, TimerQueryCore, TimerQueryExt } m_timerQueryVersion;
-    GLuint m_timer[2];
-#endif
+    Q_DECLARE_PRIVATE(RenderTimer)
+    RenderTimerPrivate *d_ptr;
 };
 
 #endif // RENDERTIMER_H

=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-07-15 11:40:02 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-10-16 12:58:00 +0000
@@ -101,28 +101,29 @@
         return center;
     }
 
-
-
-	/*!
-		Move Mouse from x,y to distance of dx, dy divided to steps with a stepdelay (ms).
-	*/
-	function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay) {
-		mouseMove(item,x,y);
-		var step_dx = dx/steps;
-		var step_dy = dy/steps;
-
-		var ix = 0;
-		var iy = 0;
-		for (var step=0; step<steps; step++) {
-			if (ix<dx) {
-				ix += step_dx;
-			}
-			if (iy<dx) {
-				iy += step_dy;
-			}
-			mouseMove(item,x + ix,y + iy,stepdelay);
-		}
-	}
+    /*!
+        Move Mouse from x,y to distance of dx, dy divided to steps with a stepdelay (ms).
+    */
+    function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay) {
+        mouseMove(item, x, y);
+        var abs_dx = Math.abs(dx)
+        var abs_dy = Math.abs(dy)
+        var step_dx = dx / steps;
+        var step_dy = dy /steps;
+
+        var ix = 0;
+        var iy = 0;
+
+        for (var step=0; step < steps; step++) {
+            if (ix < abs_dx) {
+                ix += step_dx;
+            }
+            if (iy < abs_dy) {
+                iy += step_dy;
+            }
+            mouseMove(item, x + ix, y + iy, stepdelay);
+        }
+    }
 
     /*!
       \qmlmethod UbuntuTestCase::flick(item, x, y, dx, dy, pressTimeout = -1, steps = -1, button = Qt.LeftButton, modifiers = Qt.NoModifiers, delay = -1)

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py	2014-10-16 12:58:00 +0000
@@ -0,0 +1,51 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 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/>.
+
+"""Tests for the Ubuntu UI Toolkit Header component."""
+
+import os
+
+from ubuntuuitoolkit import tests
+
+
+class DialogScrollTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_popover.qml')
+
+    def setUp(self):
+        super(DialogScrollTestCase, self).setUp()
+
+    def test_dialog_small(self):
+        button = self.main_view.select_single(objectName='button_small')
+        self.pointing_device.click_object(button)
+        dialog = self.main_view.select_single(objectName='dialog_small')
+        flickable = dialog.select_single('QQuickFlickable')
+        # There's nothing to reveal
+        self.assertTrue(flickable.atYEnd)
+
+    def test_dialog_scrollable(self):
+        button = self.main_view.select_single(objectName='button_huge')
+        self.pointing_device.click_object(button)
+        dialog = self.main_view.select_single(objectName='dialog_huge')
+        flickable = dialog.select_single('QQuickFlickable')
+        buttlet = dialog.select_single(objectName='buttlet49')
+        # We can scroll
+        self.assertFalse(flickable.atYEnd)
+        flickable.swipe_child_into_view(buttlet)
+        self.assertEqual(flickable.is_child_visible(buttlet), True)

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.qml	2014-10-16 12:58:00 +0000
@@ -0,0 +1,70 @@
+/*
+ * 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.Popups 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Page {
+        title: "Popover"
+
+        Column {
+            Button {
+                objectName: "button_small"
+                text: "Small"
+                onClicked: PopupUtils.open(smallDialogComponent)
+            }
+            Button {
+                objectName: "button_huge"
+                text: "Huge"
+                onClicked: PopupUtils.open(hugeDialogComponent)
+            }
+        }
+
+        Component {
+            id: smallDialogComponent
+            Dialog {
+                objectName: "dialog_small"
+                Column {
+                    Button {
+                        text: "Just a button"
+                    }
+                }
+            }
+        }
+
+        Component {
+            id: hugeDialogComponent
+            Dialog {
+                objectName: "dialog_huge"
+                Column {
+                    Repeater {
+                        model: 50
+
+                        Button {
+                            objectName: "buttlet%1".arg(index)
+                            text: "Button %1".arg(index)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

=== modified file 'tests/qmlapicheck.py'
--- tests/qmlapicheck.py	2014-09-03 10:24:54 +0000
+++ tests/qmlapicheck.py	2014-10-16 12:58:00 +0000
@@ -84,6 +84,8 @@
 def skipversion(filename):
     for v in ['10', '11']:
         filename = filename.replace(v + '/', '')
+    if filename[-8:] == 'qmltypes':
+        filename = os.path.basename(filename)
     return filename
 inputfiles.sort(key=skipversion)
 
@@ -110,7 +112,7 @@
         if fileinput.filename() in classes:
             classname = ' '.join(classes[fileinput.filename()])
         else:
-            classname = fileinput.filename()
+            classname = os.path.basename(fileinput.filename())
         print(classname)
 
     line = line.split('//')[0]

=== modified file 'tests/qmlapicheck.sh'
--- tests/qmlapicheck.sh	2014-09-05 05:49:46 +0000
+++ tests/qmlapicheck.sh	2014-10-16 12:58:00 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 #
 # Copyright 2013 Canonical Ltd.
 #
@@ -15,28 +15,37 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ################################################################################
+BLDDIR=$1
+if [ -z "$BLDDIR" ]; then
+    echo "Usage: " $(basename $0) "BUILDFOLDER"
+    exit 1
+fi
+
 QML="modules/Ubuntu/*/qmldir modules/Ubuntu/Components/*/qmldir"
 CPP="Ubuntu.Components Ubuntu.Layouts Ubuntu.PerformanceMetrics Ubuntu.Test"
 
 echo Dumping QML API of C++ components
-echo '' > plugins.qmltypes
+echo '' > $BLDDIR/plugins.qmltypes
 ERRORS=0
 for i in $CPP; do
     # Silence spam on stderr due to fonts
     # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
     # https://bugreports.qt-project.org/browse/QTBUG-36243
-    ALARM_BACKEND=memory qmlplugindump $i 0.1 modules 1>> plugins.qmltypes
+    modulePath=${i//./\/}
+    pushd "$BLDDIR/../modules/${modulePath}"
+    ALARM_BACKEND=memory qmlplugindump $i 0.1 ../../ 1>> $BLDDIR/plugins.qmltypes
     test $? != 0 && ERRORS=1
+    popd
 done
 test $ERRORS = 1 && echo Error: qmlplugindump failed && exit 1
 
 echo Running QML API check for $QML
 # Palette and UbuntuColors gets included in Qt > 5.2 qmlplugindump even though it's qml
-BUILTINS=QQuick,QQml,U1db::,Palette,UbuntuColors python3 tests/qmlapicheck.py $QML plugins.qmltypes > components.api.new
+BUILTINS=QQuick,QQml,U1db::,Palette,UbuntuColors python3 tests/qmlapicheck.py $QML $BLDDIR/plugins.qmltypes > $BLDDIR/components.api.new
 test $? != 0 && echo Error: qmlapicheck.py failed && exit 1
 
 echo Verifying the diff between existing and generated API
-diff -Fqml -u components.api components.api.new
+diff -Fqml -u components.api $BLDDIR/components.api.new
 test $? != 0 && ERRORS=1
 
 if [ "x$ERRORS" != "x1" ]; then

=== modified file 'tests/uitk_test_plan.sh'
--- tests/uitk_test_plan.sh	2014-09-22 09:45:35 +0000
+++ tests/uitk_test_plan.sh	2014-10-16 12:58:00 +0000
@@ -29,40 +29,38 @@
 DISTRO="ubuntu-rtm" 
 SERIES="14.09"
 CHANNEL="ubuntu-touch/${DISTRO}/${SERIES}-proposed"
-PWD="0000"
-BOOTTIME=300
+PASSWORD="0000"
+BOOTTIME=500
+ONLYCOMPARE=false
     
 declare -a TEST_SUITE=(
-    " -p dialer-app-autopilot dialer_app"
+    " -p ubuntu-ui-toolkit-autopilot ubuntuuitoolkit"
+    " -p webbrowser-app-autopilot webbrowser_app"
+    " -p address-book-app-autopilot address_book_app" 
+    " sudoku_app"
+    " online_accounts_ui"
+    " ubuntu_calculator_app"
     " -p messaging-app-autopilot messaging_app"
-    " -p reminders-app-autopilot reminders"
-    " -p ubuntu-system-settings-autopilot ubuntu_system_settings"
-    " -p ubuntu-html5-ui-toolkit-autopilot ubuntu_html5_ui_toolkit"
-    " -p unity-webapps-qml-autopilot unity_webapps_qml"
-    " -p address-book-app-autopilot address_book_app" 
+    " -p mediaplayer-app-autopilot mediaplayer_app"
     " dropping_letters_app"
-    " sudoku_app"
-    " -p ubuntu-ui-toolkit-autopilot ubuntuuitoolkit"
-    " -p webbrowser-app-autopilot webbrowser_app"
+    " -p dialer-app-autopilot dialer_app"
+#hangs    " -p reminders-app-autopilot reminders"
     " shorts_app"
     " ubuntu_weather_app"
-    " online_accounts_ui"
+    " -p ubuntu-system-settings-autopilot ubuntu_system_settings"
+    " music_app"
+    " gallery_app"
     " filemanager"
-    " calendar_app" 
-    " music_app"
-    " -p mediaplayer-app-autopilot mediaplayer_app"
     " ubuntu_terminal_app"
+    " -n unity8"
     " ubuntu_clock_app"
-    " ubuntu_calculator_app"
-    " gallery_app"
-#    " -n unity8"
-#    " -p camera-app-autopilot camera_app"
 )
 
 
 UITK_PACKAGES="qtdeclarative5-ubuntu-ui-toolkit-plugin \
                ubuntu-ui-toolkit-autopilot \
-               ubuntu-ui-toolkit-theme"
+               ubuntu-ui-toolkit-theme \
+               qtorganizer5-eds"
 
 AP_PACKAGES="address-book-service-dummy \
              python3-lxml \
@@ -86,11 +84,18 @@
 	i=1
 	while [  $(adb get-state  -s ${SERIALNUMBER}) == "unknown" ]
 	do
-		echo -ne "Wait: $i seconds\r"
+		echo -ne "Wait for adb: $i seconds\r"
 		sleep 1
 		i=$[$i+1]
 	done
 	echo -ne '\n'
+        until pids=$(adb -s ${SERIALNUMBER} shell pidof unity-system-compositor|egrep -v "^$|initctl:"); 
+        do
+          echo -ne "Wait for compositor: $i seconds\r"
+          sleep 1;
+	  i=$[$i+1]
+        done;
+        echo -ne '\n'
 	return
     fi
     SLEEP=$1
@@ -113,7 +118,7 @@
 
 function reset {
      if [ ${RESET} == true  -o  x"$1" == x-f ]; then
-        adb -s ${SERIALNUMBER} shell "echo 0000|sudo -S reboot 2>&1|grep -v password"
+        adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S reboot 2>&1|grep -v password"
         sleep_indicator 120
         /usr/share/qtcreator/ubuntu/scripts/device_wait_for_shell ${SERIALNUMBER} > /dev/null
         sleep_indicator 10
@@ -122,10 +127,9 @@
         adb -s ${SERIALNUMBER} shell powerd-cli display on |egrep -v "Display State requested, cookie is|Press ctrl-c to exit|not fully supported." &
         adb -s ${SERIALNUMBER} shell powerd-cli active |egrep -v "requested, cookie is|Press ctrl-c to exit|not fully supported." &
         sleep_indicator 10
-        adb -s ${SERIALNUMBER} shell "sudo -u phablet -i gdbus call --session --dest com.canonical.UnityGreeter \
-                                                 --object-path / \
-                                                 --method com.canonical.UnityGreeter.HideGreeter|grep -v '\(\)'"
-        adb -s ${SERIALNUMBER} shell "echo 0000|sudo -S dbus-send   --system --print-reply \
+        adb -s ${SERIALNUMBER} shell amixer -D pulse set Master 1+ mute 2>&1 > /dev/null
+        adb -s ${SERIALNUMBER} shell "gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter|grep -v '\(\)'"
+        adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S dbus-send   --system --print-reply \
                                                  --dest=org.freedesktop.Accounts \
                                                  /org/freedesktop/Accounts/User32011 \
                                                  org.freedesktop.DBus.Properties.Set \
@@ -137,10 +141,10 @@
 function device_comission {
     adb -s ${SERIALNUMBER} wait-for-device
     # Avoid https://bugs.launchpad.net/gallery-app/+bug/1363190
-    adb -s ${SERIALNUMBER} shell "echo 0000 |sudo -S rm -rf /userdata/user-data/phablet/.cache/com.ubuntu.gallery 2>&1|grep -v password"
+    adb -s ${SERIALNUMBER} shell "echo ${PASSWORD} |sudo -S rm -rf /userdata/user-data/phablet/.cache/com.ubuntu.gallery 2>&1|grep -v password"
     # flash the latest image
     echo -e "Flashing \e[31m${CHANNEL}\e[0m"
-    ubuntu-device-flash --serial=${SERIALNUMBER} --channel=${CHANNEL} --wipe --developer-mode --password=0000 
+    ubuntu-device-flash --serial=${SERIALNUMBER} --channel=${CHANNEL} --wipe --developer-mode --password=${PASSWORD} 
     sleep_indicator ${BOOTTIME}
     echo -e "Disable the intro wizard"
     phablet-config -s ${SERIALNUMBER}  welcome-wizard --disable
@@ -148,31 +152,33 @@
     phablet-config -s ${SERIALNUMBER} edges-intro --disable
     echo -e "Clone the network "
     network
-    adb -s ${SERIALNUMBER} shell "echo 0000|sudo -S reboot 2>&1|grep -v password"
+    adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S reboot 2>&1|grep -v password"
     sleep_indicator 120
     echo -e "phablet-click-test-setup  \e[31m${DISTRO} ${SERIES}\e[0m"
     phablet-click-test-setup -s ${SERIALNUMBER} --distribution=${DISTRO} --series=${SERIES} 2>&1 
-    echo "Sleep after phablet-click-test-setup";sleep_indicator 120
+    echo "Sleep after phablet-click-test-setup";
+    sleep_indicator 120
     if [ ${PPA} == "archive"  ]; then
         echo "Set up with the archive image"
-        phablet-config -s ${SERIALNUMBER} writable-image -r 0000 2>&1 > /dev/null
-        echo "Sleep after phablet-config";sleep_indicator 120
+        phablet-config -s ${SERIALNUMBER} writable-image -r ${PASSWORD} 2>&1 > /dev/null
+        echo "Sleep after phablet-config";
+        sleep_indicator 120
         network
     else
         if [[ "$PPA" =~ ^[0-9]{3}$ ]]; then
             echo -e "Set up with the silo \e[31m${PPA}\e[0m"
-            phablet-config -s ${SERIALNUMBER} writable-image -r 0000 2>&1 > /dev/null
+            phablet-config -s ${SERIALNUMBER} writable-image -r ${PASSWORD} 2>&1 > /dev/null
 	    sleep_indicator 120
             network
-            adb -s ${SERIALNUMBER} shell "echo 0000|sudo -S  bash -c 'echo \"deb http://ppa.launchpad.net/ci-train-ppa-service/landing-${PPA}/${DISTRO} ${SERIES} main\" > /etc/apt/sources.list.d/silo-${PPA}.list'"
-            adb -s ${SERIALNUMBER} shell "echo 0000|sudo -S apt-get update 2>&1|grep -v password > /dev/null"
+            adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S  bash -c 'echo \"deb http://ppa.launchpad.net/ci-train-ppa-service/landing-${PPA}/${DISTRO} ${SERIES} main\" > /etc/apt/sources.list.d/silo-${PPA}.list'"
+            adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S apt-get update 2>&1|grep -v password > /dev/null"
         else
             echo  -e "Set up with the PPA \e[31m${PPA}\e[0m"
-            phablet-config -s ${SERIALNUMBER} writable-image -r 0000  2>&1 > /dev/null
+            phablet-config -s ${SERIALNUMBER} writable-image -r ${PASSWORD}  2>&1 > /dev/null
 	    sleep_indicator 120
             network
-            adb -s ${SERIALNUMBER} shell "echo 0000|sudo -S  bash -c 'echo \"deb http://ppa.launchpad.net/${PPA}/${DISTRO} ${SERIES} main\" > /etc/apt/sources.list.d/testing-ppa.list'"
-            adb -s ${SERIALNUMBER} shell "echo 0000|sudo -S apt-get update 2>&1|grep -v password > /dev/null"
+            adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S  bash -c 'echo \"deb http://ppa.launchpad.net/${PPA}/${DISTRO} ${SERIES} main\" > /etc/apt/sources.list.d/testing-ppa.list'"
+            adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S apt-get update 2>&1|grep -v password > /dev/null"
 
         fi
     fi
@@ -180,15 +186,38 @@
     UITK_VERSION=`adb -s ${SERIALNUMBER} shell "stty cols 250; dpkg -l"|grep qtdeclarative5-ubuntu-ui-toolkit-plugin|awk '{print $3}'`
     echo -e "Original UITK version:\t\e[31m${UITK_VERSION}\e[0m"
     echo "Updating APT";
-    adb -s ${SERIALNUMBER} shell "echo 0000 |sudo -S apt-get update  2>&1|grep -v password > /dev/null"
+    adb -s ${SERIALNUMBER} shell "echo ${PASSWORD} |sudo -S apt-get update  2>&1|grep -v password > /dev/null"
     echo "Install the UITK packages"
-    adb -s ${SERIALNUMBER} shell "echo 0000|sudo -S apt-get install --yes --force-yes ${UITK_PACKAGES} 2>&1 |grep -v password > /dev/null"
+    adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S apt-get install --yes --force-yes ${UITK_PACKAGES} 2>&1 |grep -v password > /dev/null"
     UITK_VERSION=`adb -s ${SERIALNUMBER} shell "stty cols 250; dpkg -l"|grep qtdeclarative5-ubuntu-ui-toolkit-plugin|awk '{print $3}'`
     echo -e "New UITK version:\t\e[31m${UITK_VERSION}\e[0m"
     # Update APT
-    adb -s ${SERIALNUMBER} shell "echo 0000 |sudo -S apt-get update 2>&1|grep -v password > /dev/null"
+    adb -s ${SERIALNUMBER} shell "echo ${PASSWORD} |sudo -S apt-get update 2>&1|grep -v password > /dev/null"
     # Install the autopilot tests for the apps
-    adb -s ${SERIALNUMBER} shell "echo 0000 |sudo -S apt-get install --yes --force-yes ${AP_PACKAGES} 2>&1 | grep -v password > /dev/null"
+    adb -s ${SERIALNUMBER} shell "echo ${PASSWORD} |sudo -S apt-get install --yes --force-yes ${AP_PACKAGES} 2>&1 | grep -v password > /dev/null"
+}
+
+function compare_results {
+    sed -i 's/\r//g' *tests
+    for RESULT_FILE in *${PPA}.tests;
+    do
+        echo "$RESULT_FILE";
+        LAST_LINE=`tail -1 $RESULT_FILE`
+        if [[ "$LAST_LINE" =~ OK || "$LAST_LINE" =~ FAILED ]]; then
+	    echo -e  "\t"`tail -2 $RESULT_FILE`
+	else
+	    echo -e "\t\e[31mBroken tests\e[0m"
+        fi
+        egrep -v "NO TAGS DATABASE" $RESULT_FILE |egrep "^ERROR:|^FAIL:" | while read -r FAILED ; 
+        do
+            echo -e "\tFailed with ${PPA} - $FAILED"
+            if grep --quiet "$FAILED" *archive.tests; then
+                echo -e "\tSame on archive"
+            else
+                echo -e "\t\e[31mPossible regression\e[0m"
+            fi
+        done
+    done
 }
 
 while getopts ":hrcintdus:o:p:f:" opt; do
@@ -216,6 +245,9 @@
         c)
             COMISSION=true
             ;;
+        d)
+            ONLYCOMPARE=true
+            ;;
         n)
             DONOTRUNTESTS=true
             ;;
@@ -227,15 +259,46 @@
             ;;
         h)
             echo "Usage: uitk_test_plan.sh -s [serial number] -m -c"
-            echo " -r : Reset after each tests. Default: ${RESET}"
-            echo " -s : Use the device with the given serial number. Default: ${SERIALNUMBER}"
-            echo " -c : Comission the device with the ${PPA} enabled"
-            echo " -n : Do not run the test set. Default ${DONOTRUNTESTS}"
-            echo " -o : Output directory. Default $OUTPUTDIR"
-            echo " -p : Source PPA for the UITK. Default $PPA. Use -p archive to test stock image or -p [0-9]* to set a silo."
-            echo " -f : Filter for the test suite. Default $FILTER"
-            echo " -u : Provision the Development release of Ubuntu. Default is RTM."
-            exit
+            echo -e "\t-r : Reset after each tests. Default: ${RESET}"
+            echo -e "\t-s : Use the device with the given serial number. Default: ${SERIALNUMBER}"
+            echo -e "\t-c : Comission the device with the ${PPA} enabled"
+            echo -e "\t-d : Only compare the -p ${PPA} results with the archive test results. Default: ${ONLYCOMPARE}"
+            echo -e "\t-n : Do not run the test set. Default ${DONOTRUNTESTS}"
+            echo -e "\t-o : Output directory. Default $OUTPUTDIR"
+            echo -e "\t-p : Source PPA for the UITK. Default $PPA. Use -p archive to test stock image or -p [0-9]* to set a silo."
+            echo -e "\t-f : Filter for the test suite. Default $FILTER"
+            echo -e "\t-u : Provision the Development release of Ubuntu. Default is RTM."
+            echo ""
+            echo "By default tihe uitk_test_plan.sh flashes the latest RTM image on the device, installs the click application"
+            echo "tests, configures the ppa:ubuntu-sdk-team/staging PPA, installs the UITK from the PPA and executes the test plan."
+            echo ""
+            echo "Validate the staging branch of the UITK against the RTM image"
+            echo -e "\t$ ./uitk_test_plan.sh -c"
+            echo ""
+            echo "Validate the UITK from a CI silo on an RTM image"
+            echo -e "\t$ ./uitk_test_plan.sh -c -p 001"
+            echo ""
+            echo "Validate the UITK from teh archive on an RTM image"
+            echo -e "\t$ ./uitk_test_plan.sh -c -p archive"
+            echo ""
+            echo "Validate the UITK from a specific CI silo on an Ubuntu Utopic image"
+            echo -e "\t$ ./uitk_test_plan.sh -c -p 001 -u"
+            echo ""
+            echo "Provision the device for manual testing with the latest RTM image"
+            echo -e "\t$ ./uitk_test_plan.sh -c -p archive -n"
+            echo ""
+            echo "Provision the device for manual testing with the latest Ubuntu Utopic image"
+            echo -e "\t$ ./uitk_test_plan.sh -c -p archive -u -n"
+            echo ""
+            echo "Run the test plan on an already provisioned device"
+            echo -e "\t$ ./uitk_test_plan.sh"
+            echo ""
+            echo "Run only the UITK tests on an already provisioned device"
+            echo -e "\t$ ./uitk_test_plan.sh -f ubuntuuitoolkit"
+            echo ""
+            echo "Compare the archive test results with the silo 001 results"
+            echo -e "\t$ ./uitk_test_plan.sh -d -p 001"
+	    exit
             ;;
         :)
             echo "Option -$OPTARG requires an argument." >&2
@@ -243,6 +306,13 @@
     esac
 done
 
+if [ ${ONLYCOMPARE} == true ]; then
+   echo "Comparing results with the archive tests"
+   compare_results
+   exit
+fi
+
+
 # Use the first available device for testing
 if [ ${LAZY} == true ]; then
     echo "Waiting for a device"
@@ -260,40 +330,35 @@
 fi
 
 # Check if the job is only comissioning the device
-if [ ${DONOTRUNTESTS} == true ]; then
-        exit
-fi
-
-# Reset the device for testing
-reset -f
-
-# Run the test suite
-for TEST_SET in "${TEST_SUITE[@]}"
-do
-    if [[ ${TEST_SET} =~ ${FILTER} ]]; then
-        APPNAME=${TEST_SET##* }
-        LOGFILE="$OUTPUTDIR/${LOGFILENAME}-${APPNAME}-1.tests"
-        COMMAND="phablet-test-run -s ${SERIALNUMBER} $TEST_SET >> ${LOGFILE}"
-        echo "<<<=== ${APPNAME} 1 ===>>>" >> ${LOGFILE}
-        reset
-        eval ${COMMAND}
-        egrep "<<<===|Ran|OK|FAILED" ${LOGFILE}
-        # check if the tests were successful and re-run after a reset
-#        if grep -q "FAILED" ${LOGFILE}; then 
-#            reset -f
-#            LOGFILE="$OUTPUTDIR/${LOGFILENAME}-${APPNAME}-2.tests"
-#            COMMAND="phablet-test-run -s ${SERIALNUMBER} $TEST_SET >> ${LOGFILE}"
-#                echo "<<<=== ${APPNAME} 2 ===>>>" >> ${LOGFILE}
-#            eval ${COMMAND}
-#            egrep "<<<===|Ran|OK|FAILED" ${LOGFILE}
-#                if grep -q "FAILED" ${LOGFILE}; then
-#                        reset -f
-#                        LOGFILE="$OUTPUTDIR/${LOGFILENAME}-${APPNAME}-3.tests"
-#                        COMMAND="phablet-test-run -s ${SERIALNUMBER} $TEST_SET >> ${LOGFILE}"
-#                    echo "<<<=== ${APPNAME} 3 ===>>>" >> ${LOGFILE}
-#                        eval ${COMMAND}
-#                egrep "<<<===|Ran|OK|FAILED|FAIL|ERROR:" ${LOGFILE}
-#           fi
-#        fi
-    fi
-done
+if [ ${DONOTRUNTESTS} != true ]; then
+    # Reset the device for testing
+    reset -f
+
+    # Run the test suite
+    for TEST_SET in "${TEST_SUITE[@]}"
+    do
+       if [[ ${TEST_SET} =~ ${FILTER} ]]; then
+           APPNAME=${TEST_SET##* }
+           LOGFILE="$OUTPUTDIR/${LOGFILENAME}-${APPNAME}-1-${PPA}.tests"
+           COMMAND="phablet-test-run -r ${PASSWORD} -s ${SERIALNUMBER} $TEST_SET >> ${LOGFILE}"
+           echo "<<<=== ${APPNAME} 1 ===>>>" >> ${LOGFILE}
+           reset
+           eval ${COMMAND}
+           egrep "<<<===|Ran|OK|FAILED" ${LOGFILE}
+           # check if the tests were successful and re-run after a reset
+           if grep -q "FAILED" ${LOGFILE}; then 
+               reset -f
+               LOGFILE="$OUTPUTDIR/${LOGFILENAME}-${APPNAME}-2-${PPA}.tests"
+               COMMAND="phablet-test-run -r ${PASSWORD} -s ${SERIALNUMBER} $TEST_SET >> ${LOGFILE}"
+               echo "<<<=== ${APPNAME} 2 ===>>>" >> ${LOGFILE}
+               eval ${COMMAND}
+               egrep "<<<===|Ran|OK|FAILED" ${LOGFILE}
+           fi
+       fi
+    done
+fi
+
+if [ ${PPA} != "archive"  ]; then 
+   echo "Comparing results with the archive tests"
+   compare_results
+fi

=== modified file 'tests/unit/add_qmlmakecheck.pri'
--- tests/unit/add_qmlmakecheck.pri	2014-03-04 12:38:39 +0000
+++ tests/unit/add_qmlmakecheck.pri	2014-10-16 12:58:00 +0000
@@ -8,5 +8,5 @@
   check.commands += ../../unit/runtest.sh $${TARGET} $${TEST} minimal;
 }
 check.commands += cd ../../..;
-check.commands += sh tests/qmlapicheck.sh || exit 1;
+check.commands += tests/qmlapicheck.sh $${PWD}/../ || exit 1;
 check.commands += cd tests/unit

=== modified file 'tests/unit/tst_alarms/tst_alarms.cpp'
--- tests/unit/tst_alarms/tst_alarms.cpp	2014-09-25 08:19:55 +0000
+++ tests/unit/tst_alarms/tst_alarms.cpp	2014-10-16 12:58:00 +0000
@@ -45,6 +45,7 @@
     void syncFetch()
     {
         // initiate fetch
+        QSignalSpy spy(&AlarmManager::instance(), SIGNAL(alarmsChanged()));
         AlarmsAdapter *adapter = AlarmsAdapter::get();
         if (!adapter->fetchRequest) {
             adapter->fetchAlarms();
@@ -53,9 +54,21 @@
             adapter->fetchRequest->wait();
         }
         QTest::waitForEvents();
-    }
-
-    void waitForRequest(UCAlarm *alarm)
+        spy.wait(200);
+    }
+
+    void waitForUpdate(UCAlarm *alarm)
+    {
+        QSignalSpy spy(&AlarmManager::instance(), SIGNAL(alarmsUpdated(QList<QVariant>)));
+        UCAlarmPrivate *pAlarm = UCAlarmPrivate::get(alarm);
+        if (pAlarm->request) {
+            pAlarm->request->wait();
+        }
+        QTest::waitForEvents();
+        spy.wait();
+    }
+
+    void waitAndFetch(UCAlarm *alarm)
     {
         UCAlarmPrivate *pAlarm = UCAlarmPrivate::get(alarm);
         if (pAlarm->request) {
@@ -136,7 +149,7 @@
             UCAlarm *alarm = model.get(i);
             if (alarm && alarm->message().startsWith("test_")) {
                 alarm->cancel();
-                waitForRequest(alarm);
+                waitAndFetch(alarm);
                 i = 0;
             } else {
                 i++;
@@ -153,7 +166,7 @@
     void test_singleShotAlarmPass() {
         UCAlarm alarm(QDateTime::currentDateTime().addSecs(4), "test_singleShotAlarmPass");
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
     }
@@ -163,7 +176,7 @@
         UCAlarm alarm(QDateTime::currentDateTime().addSecs(20), UCAlarm::AutoDetect, "test_repeating_autoDetect");
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
     }
@@ -173,7 +186,7 @@
         UCAlarm alarm(QDateTime::currentDateTime().addSecs(10), UCAlarm::Daily, "test_repeating_daily");
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
     }
@@ -199,7 +212,7 @@
         UCAlarm alarm(QDateTime::currentDateTime(), (UCAlarm::DaysOfWeek)day, "test_repeating_givenDay_exact_" + message);
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
     }
@@ -232,7 +245,7 @@
         UCAlarmPrivate::get(&firstOccurrence)->checkAlarm();
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
         QVERIFY(containsAlarm(&firstOccurrence));
@@ -257,7 +270,7 @@
 
         UCAlarm alarm(QDateTime::currentDateTime().addSecs(3600), (UCAlarm::DaysOfWeek)dow, "test_repeating_weekly_" + message);
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
     }
@@ -291,12 +304,12 @@
         UCAlarm alarm(QDateTime::currentDateTime().addDays(1), "test_cancelPass");
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
 
         alarm.cancel();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(!containsAlarm(&alarm));
     }
@@ -308,9 +321,9 @@
         UCAlarm alarm2(dt, "test_twoAlarmsOnSameTime");
 
         alarm1.save();
-        waitForRequest(&alarm1);
+        waitAndFetch(&alarm1);
         alarm2.save();
-        waitForRequest(&alarm2);
+        waitAndFetch(&alarm2);
         QCOMPARE(alarm1.error(), (int)UCAlarm::NoError);
         QCOMPARE(alarm2.error(), (int)UCAlarm::NoError);
     }
@@ -322,9 +335,9 @@
         UCAlarm alarm2(dt, UCAlarm::Daily, "test_twoAlarmsOnSameTime2");
 
         alarm1.save();
-        waitForRequest(&alarm1);
+        waitAndFetch(&alarm1);
         alarm2.save();
-        waitForRequest(&alarm2);
+        waitAndFetch(&alarm2);
         QCOMPARE(alarm1.error(), (int)UCAlarm::NoError);
         QCOMPARE(alarm2.error(), (int)UCAlarm::NoError);
     }
@@ -336,7 +349,7 @@
         UCAlarm copy(dt, "test_updateAlarm_SameType");
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
 
@@ -344,7 +357,8 @@
         QVERIFY(!compareAlarms(&alarm, &copy));
 
         alarm.save();
-        waitForRequest(&alarm);
+        // do not fetch!
+        waitForUpdate(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
         QVERIFY(!containsAlarm(&copy));
@@ -357,14 +371,15 @@
         UCAlarm copy(dt, "test_updateAlarm_DifferentType");
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
 
         alarm.setType(UCAlarm::Repeating);
         QVERIFY(!compareAlarms(&alarm, &copy));
         alarm.save();
-        waitForRequest(&alarm);
+        // do not fetch
+        waitForUpdate(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
         QVERIFY(!containsAlarm(&copy));
@@ -375,20 +390,20 @@
         UCAlarm alarm(QDateTime::currentDateTime().addMSecs(5000), UCAlarm::AutoDetect, "test_updateAlarm_Repeating");
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QSKIP("https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1322558");
         QVERIFY(containsAlarm(&alarm));
 
         alarm.setDate(alarm.date().addDays(1));
         alarm.save();
-        waitForRequest(&alarm);
+        waitForUpdate(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
 
         alarm.setDaysOfWeek(UCAlarm::Daily);
         alarm.save();
-        waitForRequest(&alarm);
+        waitForUpdate(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
     }
@@ -399,19 +414,19 @@
         UCAlarm alarm(dt, "test_fetchAlarmPlus7Days");
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
 
         UCAlarm nextMonth(dt.addMonths(1), "test_fetchAlarmPlus1Month");
         nextMonth.save();
-        waitForRequest(&nextMonth);
+        waitAndFetch(&nextMonth);
         QCOMPARE(nextMonth.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&nextMonth));
 
         UCAlarm nextYear(dt.addYears(1), "test_fetchAlarmPlus1Year");
         nextYear.save();
-        waitForRequest(&nextYear);
+        waitAndFetch(&nextYear);
         QCOMPARE(nextYear.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&nextYear));
     }
@@ -426,7 +441,7 @@
         UCAlarm nextAlarm(nextDt, UCAlarm::Daily, "test_correctAlarmOrderDaily");
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QTest::qWait(2000);
         syncFetch();
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
@@ -443,7 +458,7 @@
         UCAlarm nextAlarm(nextDt, UCAlarm::AutoDetect, "test_correctAlarmOrderWeekly");
 
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QTest::qWait(2000);
         syncFetch();
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
@@ -500,7 +515,7 @@
         UCAlarm alarm(QDateTime::currentDateTime().addSecs(3600), "test_oneTime_dow_" + message);
         alarm.setDaysOfWeek((UCAlarm::DaysOfWeek)dow);
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
     }
@@ -531,7 +546,7 @@
         UCAlarm alarm(QDateTime::currentDateTime().addSecs(60), "test_onetime_sound");
         alarm.setSound(QUrl("file:///usr/share/sounds/ubuntu/ringtones/Celestial.ogg"));
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
 
         UCAlarm saved;
         QVERIFY(findAlarm("test_onetime_sound", saved));
@@ -544,20 +559,20 @@
         UCAlarm alarm(QDateTime::currentDateTime(), UCAlarm::AutoDetect, "test_create_update_and_disable_alarm");
         alarm.setSound(QUrl("file:///usr/share/sounds/ubuntu/ringtones/Celestial.ogg"));
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QVERIFY(containsAlarm(&alarm));
 
         // update alarm to occur 1h earlier
         QDateTime date = alarm.date();
         date.addSecs(-60);
         alarm.save();
-        waitForRequest(&alarm);
+        waitForUpdate(&alarm);
         QVERIFY(containsAlarm(&alarm));
 
         // disable alarm
         alarm.setEnabled(false);
         alarm.save();
-        waitForRequest(&alarm);
+        waitForUpdate(&alarm);
         QVERIFY(containsAlarm(&alarm));
         AlarmData data = getAlarmDataFromAlarmCookie(&alarm);
         QVERIFY(data.cookie.isValid());
@@ -567,14 +582,15 @@
     void test_change_alarm_sound()
     {
         UCAlarm alarm(QDateTime::currentDateTime(), UCAlarm::AutoDetect, "test_change_alarm_fields_sound");
+        alarm.setSound(QUrl("file:///usr/share/sounds/ubuntu/ringtones/Bliss.ogg"));
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QVERIFY(containsAlarm(&alarm));
 
         // do the change
-        alarm.setSound(QUrl("file:///usr/share/sounds/ubuntu/ringtones/Celestial.ogg"));
+        alarm.setSound(QUrl("file:///usr/share/sounds/ubuntu/ringtones/Sparkle.ogg"));
         alarm.save();
-        waitForRequest(&alarm);
+        waitForUpdate(&alarm);
         QVERIFY(containsAlarm(&alarm));
 
         //verify whether we have the desired change
@@ -595,9 +611,10 @@
         QFETCH(bool, enabled);
 
         UCAlarm alarm(QDateTime::currentDateTime().addDays(1), "test_check_alarm_tags_" + message);
+        alarm.setSound(QUrl("file:///usr/share/sounds/ubuntu/ringtones/Marimbach.ogg"));
         alarm.setEnabled(enabled);
         alarm.save();
-        waitForRequest(&alarm);
+        waitAndFetch(&alarm);
         QVERIFY(containsAlarm(&alarm));
 
         // check the tags

=== modified file 'tests/unit/tst_i18n/src/LocalizedApp.qml'
--- tests/unit/tst_i18n/src/LocalizedApp.qml	2014-04-23 08:50:20 +0000
+++ tests/unit/tst_i18n/src/LocalizedApp.qml	2014-10-16 12:58:00 +0000
@@ -24,7 +24,7 @@
 
     Page {
         objectName: 'page'
-        title: i18n.dtr('localizedApp', 'Welcome')
+        title: i18n.dtr('localizedApp', "Welcome")
         Button {
             objectName: 'button'
             anchors.centerIn: parent

=== modified file 'tests/unit_x11/tst_components/tst_textarea.qml'
--- tests/unit_x11/tst_components/tst_textarea.qml	2014-06-24 14:03:44 +0000
+++ tests/unit_x11/tst_components/tst_textarea.qml	2014-10-16 12:58:00 +0000
@@ -191,6 +191,16 @@
 
         function test_0_readOnly() {
             compare(textArea.readOnly,textEdit.readOnly,"TextArea.readOnly is same as TextEdit.readOnly")
+
+            textArea.text = "ab";
+            textArea.cursorPosition = 1;
+            textArea.textFormat = TextEdit.PlainText;
+            keyClick(Qt.Key_Return);
+            compare("ab", textArea.text, "No split occurred in plain area");
+
+            textArea.textFormat = TextEdit.RichText;
+            keyClick(Qt.Key_Return);
+            compare(textArea.text.indexOf("<br />"), -1, "No split occurred in rich area");
         }
 
         function test_0_renderType() {