Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-06-01 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

OTA12-2016-06-01

OTA12-2016-06-01

[lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-06-01]

1990. By Zoltan Balogh on 2016-06-01

Add changelog

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-27 07:08:44 +0000
+++ debian/changelog	2016-06-01 11:49:05 +0000
@@ -1,3 +1,17 @@
+ubuntu-ui-toolkit (1.3.1988+16.10) UNRELEASED; urgency=medium
+
+  [ Christian Dywan ]
+  * UCAbstractButton needs to accept key release events. Fixes LP: #1581026
+
+  [ Andrea Bernabei ]
+  * Documentation: fix missing or outdated imports in QML modules (Popups,
+    Pickers, Themes, ListItems), misuse of qdoc API and similar. 
+    Fixes LP: #1570156, LP: #1585557, LP: #1585585, LP: #1585591.
+  * tst_slotslayout: tentative fix for a very rare CI failure. 
+    Fixes LP: #1571426
+
+ -- Zoltán Balogh <[e-mail]>  Wed, 01 Jun 2016 14:31:28 +0300
+
 ubuntu-ui-toolkit (1.3.1984+16.10.20160527.2) yakkety; urgency=medium
 
   [ Christian Dywan ]

=== modified file 'documentation/ubuntu-components-listitems.qdoc'
--- documentation/ubuntu-components-listitems.qdoc	2014-04-20 19:25:12 +0000
+++ documentation/ubuntu-components-listitems.qdoc	2016-06-01 11:49:05 +0000
@@ -15,6 +15,6 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components.ListItems 1.0
+    \qmlmodule Ubuntu.Components.ListItems 1.3
     \title List Items
 */

=== modified file 'documentation/ubuntu-components-pickers.qdoc'
--- documentation/ubuntu-components-pickers.qdoc	2014-04-20 19:25:12 +0000
+++ documentation/ubuntu-components-pickers.qdoc	2016-06-01 11:49:05 +0000
@@ -15,6 +15,6 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components.Pickers 1.0
+    \qmlmodule Ubuntu.Components.Pickers 1.3
     \title Pickers
 */

=== modified file 'documentation/ubuntu-components-popups.qdoc'
--- documentation/ubuntu-components-popups.qdoc	2014-04-20 19:25:12 +0000
+++ documentation/ubuntu-components-popups.qdoc	2016-06-01 11:49:05 +0000
@@ -15,6 +15,6 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components.Popups 1.0
+    \qmlmodule Ubuntu.Components.Popups 1.3
     \title Popovers, Sheets and Dialogs 
 */

=== added file 'documentation/ubuntu-components-styles.qdoc'
--- documentation/ubuntu-components-styles.qdoc	1970-01-01 00:00:00 +0000
+++ documentation/ubuntu-components-styles.qdoc	2016-06-01 11:49:05 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016 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/>.
+ */
+
+/*!
+    \qmlmodule Ubuntu.Components.Styles 1.3
+    \title Styles
+*/

=== added file 'documentation/ubuntu-components-themes.qdoc'
--- documentation/ubuntu-components-themes.qdoc	1970-01-01 00:00:00 +0000
+++ documentation/ubuntu-components-themes.qdoc	2016-06-01 11:49:05 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016 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/>.
+ */
+
+/*!
+    \qmlmodule Ubuntu.Components.Themes 1.3
+    \title Themes
+*/

=== modified file 'src/Ubuntu/Components/1.0/ProgressBar.qml'
--- src/Ubuntu/Components/1.0/ProgressBar.qml	2015-07-24 11:09:09 +0000
+++ src/Ubuntu/Components/1.0/ProgressBar.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype ProgressBar
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The ProgressBar component visually indicates the progress of a process of
     determinate or indeterminate duration.

=== modified file 'src/Ubuntu/Components/1.1/Button.qml'
--- src/Ubuntu/Components/1.1/Button.qml	2016-02-03 00:17:56 +0000
+++ src/Ubuntu/Components/1.1/Button.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Button
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Standard Ubuntu button.
 

=== modified file 'src/Ubuntu/Components/1.1/UbuntuColors.qml'
--- src/Ubuntu/Components/1.1/UbuntuColors.qml	2015-03-03 12:53:42 +0000
+++ src/Ubuntu/Components/1.1/UbuntuColors.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype UbuntuColors
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Singleton defining the Ubuntu color palette.
 

=== modified file 'src/Ubuntu/Components/1.2/AbstractButton.qml'
--- src/Ubuntu/Components/1.2/AbstractButton.qml	2015-12-14 15:47:03 +0000
+++ src/Ubuntu/Components/1.2/AbstractButton.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmlabstract AbstractButton
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The AbstractButton class defines the behavior of the button.
 

=== modified file 'src/Ubuntu/Components/1.2/ActionList.qml'
--- src/Ubuntu/Components/1.2/ActionList.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/ActionList.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype ActionList
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief List of \l Action items
 */

=== modified file 'src/Ubuntu/Components/1.2/ActivityIndicator.qml'
--- src/Ubuntu/Components/1.2/ActivityIndicator.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/ActivityIndicator.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ActivityIndicator
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The ActivityIndicator component visually indicates that a task of
     unknown duration is in progress, e.g. busy indication, connection in progress

=== modified file 'src/Ubuntu/Components/1.2/AnimatedItem.qml'
--- src/Ubuntu/Components/1.2/AnimatedItem.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/AnimatedItem.qml	2016-06-01 11:49:05 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype AnimatedItem
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The AnimatedItem drives the animated components behavior inside a Flickable.
     Reports whether the component whos parent is a Flickable is in the visible area or not,

=== modified file 'src/Ubuntu/Components/1.2/AppHeader.qml'
--- src/Ubuntu/Components/1.2/AppHeader.qml	2015-12-14 19:48:44 +0000
+++ src/Ubuntu/Components/1.2/AppHeader.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 /*!
     \internal
     \qmltype AppHeader
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
 */
 Components.StyledItem {

=== modified file 'src/Ubuntu/Components/1.2/Captions.qml'
--- src/Ubuntu/Components/1.2/Captions.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/Captions.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
   \qmltype Captions
-  \inqmlmodule Ubuntu.Components 1.2
+  \inqmlmodule Ubuntu.Components
   \ingroup ubuntu-listitem
   \since Ubuntu.Components 1.2
   \brief Container providing captionStyles for a twin-label column that can be used in

=== modified file 'src/Ubuntu/Components/1.2/CheckBox.qml'
--- src/Ubuntu/Components/1.2/CheckBox.qml	2015-08-25 13:10:20 +0000
+++ src/Ubuntu/Components/1.2/CheckBox.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype CheckBox
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief CheckBox is a component with two states, checked or unchecked. It can
     be used to set boolean options. The behavior is the same as \l Switch, the

=== modified file 'src/Ubuntu/Components/1.2/ComboButton.qml'
--- src/Ubuntu/Components/1.2/ComboButton.qml	2015-08-25 13:10:20 +0000
+++ src/Ubuntu/Components/1.2/ComboButton.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype ComboButton
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Ubuntu button providing a drop-down panel visualizing custom options.
 

=== modified file 'src/Ubuntu/Components/1.2/Label.qml'
--- src/Ubuntu/Components/1.2/Label.qml	2016-02-03 00:17:56 +0000
+++ src/Ubuntu/Components/1.2/Label.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Label
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Text with Ubuntu styling.
 

=== modified file 'src/Ubuntu/Components/1.2/Object.qml'
--- src/Ubuntu/Components/1.2/Object.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/Object.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 /*!
     \qmltype Object
     \internal
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Internal type used for lightweight objects that can have children.
 */

=== modified file 'src/Ubuntu/Components/1.2/OptionSelector.qml'
--- src/Ubuntu/Components/1.2/OptionSelector.qml	2015-05-01 19:38:57 +0000
+++ src/Ubuntu/Components/1.2/OptionSelector.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype OptionSelector
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu-components
     \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a
     listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically.

=== modified file 'src/Ubuntu/Components/1.2/OptionSelectorDelegate.qml'
--- src/Ubuntu/Components/1.2/OptionSelectorDelegate.qml	2016-04-29 09:52:20 +0000
+++ src/Ubuntu/Components/1.2/OptionSelectorDelegate.qml	2016-06-01 11:49:05 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype OptionSelectorDelegate
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu-components
     \brief OptionSelector delegate which can display text, subtext and an image from a custom model.
 

=== modified file 'src/Ubuntu/Components/1.2/OrientationHelper.qml'
--- src/Ubuntu/Components/1.2/OrientationHelper.qml	2015-07-02 17:39:03 +0000
+++ src/Ubuntu/Components/1.2/OrientationHelper.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype OrientationHelper
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The OrientationHelper automatically rotates its children following the
            orientation of the device.

=== modified file 'src/Ubuntu/Components/1.2/PageHeadConfiguration.qml'
--- src/Ubuntu/Components/1.2/PageHeadConfiguration.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/PageHeadConfiguration.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PageHeadConfiguration
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
     \brief Page.head is used to configure the header for a \l Page.

=== modified file 'src/Ubuntu/Components/1.2/PageHeadSections.qml'
--- src/Ubuntu/Components/1.2/PageHeadSections.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/PageHeadSections.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype PageHeadSections
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
     \brief PageHeadSections is used to configure the sections for a \l Page.

=== modified file 'src/Ubuntu/Components/1.2/PageHeadState.qml'
--- src/Ubuntu/Components/1.2/PageHeadState.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/PageHeadState.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PageHeadState
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
     \brief PageHeadState is a helper component to make it easier to

=== modified file 'src/Ubuntu/Components/1.2/PageStack.qml'
--- src/Ubuntu/Components/1.2/PageStack.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/PageStack.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PageStack
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief A stack of \l Page items that is used for inter-Page navigation.
         Pages on the stack can be popped, and new Pages can be pushed.

=== modified file 'src/Ubuntu/Components/1.2/PageTreeNode.qml'
--- src/Ubuntu/Components/1.2/PageTreeNode.qml	2015-12-17 09:13:29 +0000
+++ src/Ubuntu/Components/1.2/PageTreeNode.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 /*!
     \internal
     \qmltype PageTreeNode
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs.
 

=== modified file 'src/Ubuntu/Components/1.2/PageWrapper.qml'
--- src/Ubuntu/Components/1.2/PageWrapper.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/PageWrapper.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 /*!
     \internal
     \qmltype PageWrapper
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Internal class used by \l PageStack
 */

=== modified file 'src/Ubuntu/Components/1.2/Panel.qml'
--- src/Ubuntu/Components/1.2/Panel.qml	2016-01-26 09:53:02 +0000
+++ src/Ubuntu/Components/1.2/Panel.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Panel
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief A panel that can be swiped in and out from an edge of the window by the user.
     For most applications, it is highly recommended to use the \l MainView instead which includes

=== modified file 'src/Ubuntu/Components/1.2/PullToRefresh.qml'
--- src/Ubuntu/Components/1.2/PullToRefresh.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/PullToRefresh.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PullToRefresh
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
     \brief Pull-to-refresh component for Flickables to reload a model upon pull.

=== modified file 'src/Ubuntu/Components/1.2/Scrollbar.qml'
--- src/Ubuntu/Components/1.2/Scrollbar.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/Scrollbar.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype ScrollBar
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The ScrollBar component provides scrolling functionality for
     scrollable views (i.e. Flickable, ListView).

=== modified file 'src/Ubuntu/Components/1.2/Slider.qml'
--- src/Ubuntu/Components/1.2/Slider.qml	2015-11-18 09:48:38 +0000
+++ src/Ubuntu/Components/1.2/Slider.qml	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Slider
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Slider is a component to select a value from a continuous range of
      values.

=== modified file 'src/Ubuntu/Components/1.2/Switch.qml'
--- src/Ubuntu/Components/1.2/Switch.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/Switch.qml	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Switch
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Switch is a component with two states, checked or unchecked. It can
     be used to set boolean options. The behavior is the same as \l CheckBox, the

=== modified file 'src/Ubuntu/Components/1.2/Tab.qml'
--- src/Ubuntu/Components/1.2/Tab.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/Tab.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Tab
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Component to represent a single tab in a \l Tabs environment.
 

=== modified file 'src/Ubuntu/Components/1.2/TabBar.qml'
--- src/Ubuntu/Components/1.2/TabBar.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/TabBar.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype TabBar
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Tab bar that will be shown in the header when \l Tabs is active.
         This component does not need to be instantiated by the developer, it is

=== modified file 'src/Ubuntu/Components/1.2/Tabs.qml'
--- src/Ubuntu/Components/1.2/Tabs.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/Tabs.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Tabs
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The Tabs class provides an environment where multible \l Tab
     children can be added, and the user is presented with a tab

=== modified file 'src/Ubuntu/Components/1.2/TextArea.qml'
--- src/Ubuntu/Components/1.2/TextArea.qml	2016-02-03 00:17:56 +0000
+++ src/Ubuntu/Components/1.2/TextArea.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype TextArea
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The TextArea item displays a block of editable, scrollable, formatted
     text.

=== modified file 'src/Ubuntu/Components/1.2/TextField.qml'
--- src/Ubuntu/Components/1.2/TextField.qml	2016-02-03 00:17:56 +0000
+++ src/Ubuntu/Components/1.2/TextField.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype TextField
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The TextField element displays a single line of editable plain text.
     Input constraints can be set through validator or inputMask. Setting echoMode

=== modified file 'src/Ubuntu/Components/1.2/Toolbar.qml'
--- src/Ubuntu/Components/1.2/Toolbar.qml	2015-12-17 09:13:29 +0000
+++ src/Ubuntu/Components/1.2/Toolbar.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 /*!
     \internal
     \qmltype Toolbar
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Application toolbar. This class is not exposed because it will
             be automatically added when a Page defines tools.

=== modified file 'src/Ubuntu/Components/1.2/ToolbarButton.qml'
--- src/Ubuntu/Components/1.2/ToolbarButton.qml	2015-08-18 15:51:43 +0000
+++ src/Ubuntu/Components/1.2/ToolbarButton.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype ToolbarButton
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief An \l ActionItem that represents a button in the toolbar.
         ToolbarButtons should be included in \l ToolbarItems to define the tools of a \l Page.

=== modified file 'src/Ubuntu/Components/1.2/ToolbarItems.qml'
--- src/Ubuntu/Components/1.2/ToolbarItems.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/ToolbarItems.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ToolbarItems
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \deprecated
     \brief Row of Items to be placed in a toolbar.

=== modified file 'src/Ubuntu/Components/1.2/UbuntuListView.qml'
--- src/Ubuntu/Components/1.2/UbuntuListView.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/UbuntuListView.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype UbuntuListView
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief A ListView with special features tailored for a look and feel fitting the
     Ubuntu Touch platform.

=== modified file 'src/Ubuntu/Components/1.2/UbuntuNumberAnimation.qml'
--- src/Ubuntu/Components/1.2/UbuntuNumberAnimation.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/UbuntuNumberAnimation.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype UbuntuNumberAnimation
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief UbuntuNumberAnimation is a NumberAnimation that has predefined
            settings to ensure that Ubuntu applications are consistent in their animations.

=== modified file 'src/Ubuntu/Components/1.3/ActionBar.qml'
--- src/Ubuntu/Components/1.3/ActionBar.qml	2015-12-21 20:17:16 +0000
+++ src/Ubuntu/Components/1.3/ActionBar.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype ActionBar
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Show a row of buttons that trigger actions. When the
         number of visible actions specified is larger than

=== modified file 'src/Ubuntu/Components/1.3/ActionList.qml'
--- src/Ubuntu/Components/1.3/ActionList.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/ActionList.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype ActionList
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief List of \l Action items
 */

=== modified file 'src/Ubuntu/Components/1.3/ActivityIndicator.qml'
--- src/Ubuntu/Components/1.3/ActivityIndicator.qml	2015-10-01 06:51:58 +0000
+++ src/Ubuntu/Components/1.3/ActivityIndicator.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ActivityIndicator
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The ActivityIndicator component visually indicates that a task of
     unknown duration is in progress, e.g. busy indication, connection in progress

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-05-04 13:07:19 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 
 /*!
   \qmltype AdaptivePageLayout
-  \inqmlmodule Ubuntu.Components 1.3
+  \inqmlmodule Ubuntu.Components
   \since Ubuntu.Components 1.3
   \ingroup ubuntu
   \brief View with multiple columns of Pages.

=== modified file 'src/Ubuntu/Components/1.3/AnimatedItem.qml'
--- src/Ubuntu/Components/1.3/AnimatedItem.qml	2015-10-01 12:40:52 +0000
+++ src/Ubuntu/Components/1.3/AnimatedItem.qml	2016-06-01 11:49:05 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype AnimatedItem
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The AnimatedItem drives the animated components behavior inside a Flickable.
     Reports whether the component whos parent is a Flickable is in the visible area or not,

=== modified file 'src/Ubuntu/Components/1.3/AppHeader.qml'
--- src/Ubuntu/Components/1.3/AppHeader.qml	2016-02-01 21:22:01 +0000
+++ src/Ubuntu/Components/1.3/AppHeader.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 /*!
     \internal
     \qmltype AppHeader
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
 */
 Privates.AppHeaderBase {

=== modified file 'src/Ubuntu/Components/1.3/Button.qml'
--- src/Ubuntu/Components/1.3/Button.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/1.3/Button.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Button
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Standard Ubuntu button.
 

=== modified file 'src/Ubuntu/Components/1.3/Captions.qml'
--- src/Ubuntu/Components/1.3/Captions.qml	2015-09-21 14:44:13 +0000
+++ src/Ubuntu/Components/1.3/Captions.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
   \qmltype Captions
-  \inqmlmodule Ubuntu.Components 1.2
+  \inqmlmodule Ubuntu.Components
   \ingroup ubuntu-listitem
   \since Ubuntu.Components 1.2
   \brief Container providing captionStyles for a twin-label column that can be used in

=== modified file 'src/Ubuntu/Components/1.3/CheckBox.qml'
--- src/Ubuntu/Components/1.3/CheckBox.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/1.3/CheckBox.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 import Ubuntu.Components 1.3
 /*!
     \qmltype CheckBox
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief CheckBox is a component with two states, checked or unchecked. It can
     be used to set boolean options. The behavior is the same as \l Switch, the

=== modified file 'src/Ubuntu/Components/1.3/ComboButton.qml'
--- src/Ubuntu/Components/1.3/ComboButton.qml	2016-05-11 15:38:00 +0000
+++ src/Ubuntu/Components/1.3/ComboButton.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype ComboButton
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Ubuntu button providing a drop-down panel visualizing custom options.
 

=== modified file 'src/Ubuntu/Components/1.3/Icon.qml'
--- src/Ubuntu/Components/1.3/Icon.qml	2016-02-11 08:56:13 +0000
+++ src/Ubuntu/Components/1.3/Icon.qml	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Icon
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \inherits Item
     \ingroup ubuntu
     \brief The Icon component displays an icon from the icon theme.

=== modified file 'src/Ubuntu/Components/1.3/MainView.qml'
--- src/Ubuntu/Components/1.3/MainView.qml	2016-03-11 12:47:29 +0000
+++ src/Ubuntu/Components/1.3/MainView.qml	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype MainView
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \inherits StyledItem
     \brief MainView is the root Item that should be used for all applications.

=== modified file 'src/Ubuntu/Components/1.3/OptionSelector.qml'
--- src/Ubuntu/Components/1.3/OptionSelector.qml	2016-01-27 13:58:29 +0000
+++ src/Ubuntu/Components/1.3/OptionSelector.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype OptionSelector
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu-components
     \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a
     listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically.

=== modified file 'src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml'
--- src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml	2016-04-27 08:04:12 +0000
+++ src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml	2016-06-01 11:49:05 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype OptionSelectorDelegate
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu-components
     \brief OptionSelector delegate which can display text, subtext and an image from a custom model.
 

=== modified file 'src/Ubuntu/Components/1.3/OrientationHelper.qml'
--- src/Ubuntu/Components/1.3/OrientationHelper.qml	2015-07-02 17:39:03 +0000
+++ src/Ubuntu/Components/1.3/OrientationHelper.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype OrientationHelper
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The OrientationHelper automatically rotates its children following the
            orientation of the device.

=== modified file 'src/Ubuntu/Components/1.3/Page.qml'
--- src/Ubuntu/Components/1.3/Page.qml	2016-04-05 12:25:56 +0000
+++ src/Ubuntu/Components/1.3/Page.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype Page
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \inherits StyledItem
     \ingroup ubuntu
     \brief A page is the basic Item that represents a single view in

=== modified file 'src/Ubuntu/Components/1.3/PageColumn.qml'
--- src/Ubuntu/Components/1.3/PageColumn.qml	2015-08-14 05:47:23 +0000
+++ src/Ubuntu/Components/1.3/PageColumn.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
   \qmltype PageColumn
-  \inqmlmodule Ubuntu.Components 1.3
+  \inqmlmodule Ubuntu.Components
   \since Ubuntu.Components 1.3
   \ingroup ubuntu
   \brief Component configuring the metrics of a column in AdaptivePageLayout.

=== modified file 'src/Ubuntu/Components/1.3/PageColumnsLayout.qml'
--- src/Ubuntu/Components/1.3/PageColumnsLayout.qml	2015-08-12 15:19:55 +0000
+++ src/Ubuntu/Components/1.3/PageColumnsLayout.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
   \qmltype PageColumnsLayout
-  \inqmlmodule Ubuntu.Components 1.3
+  \inqmlmodule Ubuntu.Components
   \since Ubuntu.Components 1.3
   \ingroup ubuntu
   \brief Component configuring a layout in an AdaptivePageLayout component.

=== modified file 'src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc'
--- src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc	2016-05-17 20:54:33 +0000
+++ src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc	2016-06-01 11:49:05 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype PageHeadConfiguration
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
     \deprecated

=== modified file 'src/Ubuntu/Components/1.3/PageHeadSections.qml'
--- src/Ubuntu/Components/1.3/PageHeadSections.qml	2016-05-17 20:54:33 +0000
+++ src/Ubuntu/Components/1.3/PageHeadSections.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PageHeadSections
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
     \deprecated

=== modified file 'src/Ubuntu/Components/1.3/PageHeadState.qml'
--- src/Ubuntu/Components/1.3/PageHeadState.qml	2016-05-17 20:54:33 +0000
+++ src/Ubuntu/Components/1.3/PageHeadState.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PageHeadState
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
     \deprecated

=== modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
--- src/Ubuntu/Components/1.3/PageHeader.qml	2016-03-29 22:42:01 +0000
+++ src/Ubuntu/Components/1.3/PageHeader.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PageHeader
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The PageHeader shows a title with a leading and a trailing
         \l ActionBar that add action buttons to the header.

=== modified file 'src/Ubuntu/Components/1.3/PageStack.qml'
--- src/Ubuntu/Components/1.3/PageStack.qml	2016-04-08 22:22:21 +0000
+++ src/Ubuntu/Components/1.3/PageStack.qml	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype PageStack
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief A stack of \l Page items that is used for inter-Page navigation.
         Pages on the stack can be popped, and new Pages can be pushed.

=== modified file 'src/Ubuntu/Components/1.3/Panel.qml'
--- src/Ubuntu/Components/1.3/Panel.qml	2016-01-26 09:53:02 +0000
+++ src/Ubuntu/Components/1.3/Panel.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Panel
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief A panel that can be swiped in and out from an edge of the window by the user.
     For most applications, it is highly recommended to use the \l MainView instead which includes

=== modified file 'src/Ubuntu/Components/1.3/ProgressBar.qml'
--- src/Ubuntu/Components/1.3/ProgressBar.qml	2015-10-01 06:51:58 +0000
+++ src/Ubuntu/Components/1.3/ProgressBar.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ProgressBar
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The ProgressBar component visually indicates the progress of a process of
     determinate or indeterminate duration.

=== modified file 'src/Ubuntu/Components/1.3/ProgressionSlot.qml'
--- src/Ubuntu/Components/1.3/ProgressionSlot.qml	2015-09-28 16:19:42 +0000
+++ src/Ubuntu/Components/1.3/ProgressionSlot.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype ProgressionSlot
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \inherits Icon
     \ingroup ubuntu
 

=== modified file 'src/Ubuntu/Components/1.3/PullToRefresh.qml'
--- src/Ubuntu/Components/1.3/PullToRefresh.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/1.3/PullToRefresh.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PullToRefresh
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
     \brief Pull-to-refresh component for Flickables to reload a model upon pull.

=== modified file 'src/Ubuntu/Components/1.3/ScrollView.qml'
--- src/Ubuntu/Components/1.3/ScrollView.qml	2016-03-30 13:42:32 +0000
+++ src/Ubuntu/Components/1.3/ScrollView.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype ScrollView
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \inherits StyledItem
     \brief ScrollView is a scrollable view that features scrollbars and scrolling via keyboard keys.

=== modified file 'src/Ubuntu/Components/1.3/Scrollbar.qml'
--- src/Ubuntu/Components/1.3/Scrollbar.qml	2016-03-30 15:14:32 +0000
+++ src/Ubuntu/Components/1.3/Scrollbar.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Scrollbar
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The Scrollbar component provides scrolling functionality for
     scrollable views (i.e. Flickable, ListView).

=== modified file 'src/Ubuntu/Components/1.3/Sections.qml'
--- src/Ubuntu/Components/1.3/Sections.qml	2016-04-25 18:58:29 +0000
+++ src/Ubuntu/Components/1.3/Sections.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Sections
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.3
     \brief Display a list of sections that the user can select. By tapping

=== modified file 'src/Ubuntu/Components/1.3/Slider.qml'
--- src/Ubuntu/Components/1.3/Slider.qml	2016-02-12 12:51:32 +0000
+++ src/Ubuntu/Components/1.3/Slider.qml	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Slider
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Slider is a component to select a value from a continuous range of
      values.

=== modified file 'src/Ubuntu/Components/1.3/Switch.qml'
--- src/Ubuntu/Components/1.3/Switch.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/Switch.qml	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Switch
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Switch is a component with two states, checked or unchecked. It can
     be used to set boolean options. The behavior is the same as \l CheckBox, the

=== modified file 'src/Ubuntu/Components/1.3/Tab.qml'
--- src/Ubuntu/Components/1.3/Tab.qml	2016-05-17 20:54:33 +0000
+++ src/Ubuntu/Components/1.3/Tab.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Tab
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \deprecated
     \brief Component to represent a single tab in a \l Tabs environment.

=== modified file 'src/Ubuntu/Components/1.3/TabBar.qml'
--- src/Ubuntu/Components/1.3/TabBar.qml	2016-05-17 20:54:33 +0000
+++ src/Ubuntu/Components/1.3/TabBar.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype TabBar
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \deprecated
     \brief Tab bar that will be shown in the header when \l Tabs is active.

=== modified file 'src/Ubuntu/Components/1.3/Tabs.qml'
--- src/Ubuntu/Components/1.3/Tabs.qml	2016-05-17 20:54:33 +0000
+++ src/Ubuntu/Components/1.3/Tabs.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Tabs
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \deprecated
     \brief The Tabs class provides an environment where multible \l Tab

=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2016-05-12 16:30:27 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype TextArea
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The TextArea item displays a block of editable, scrollable, formatted
     text.

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2016-05-02 18:27:11 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype TextField
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The TextField element displays a single line of editable plain text.
     Input constraints can be set through validator or inputMask. Setting echoMode

=== modified file 'src/Ubuntu/Components/1.3/Toolbar.qml'
--- src/Ubuntu/Components/1.3/Toolbar.qml	2016-01-13 16:07:58 +0000
+++ src/Ubuntu/Components/1.3/Toolbar.qml	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 //  by the new text button when it becomes available.
 /*!
     \qmltype Toolbar
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Toolbar that can be used as an extension for the edit mode header.
     Example:

=== modified file 'src/Ubuntu/Components/1.3/ToolbarButton.qml'
--- src/Ubuntu/Components/1.3/ToolbarButton.qml	2016-05-17 20:54:33 +0000
+++ src/Ubuntu/Components/1.3/ToolbarButton.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype ToolbarButton
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \deprecated
     \brief An \l ActionItem that represents a button in the toolbar.

=== modified file 'src/Ubuntu/Components/1.3/ToolbarItems.qml'
--- src/Ubuntu/Components/1.3/ToolbarItems.qml	2016-05-17 20:54:33 +0000
+++ src/Ubuntu/Components/1.3/ToolbarItems.qml	2016-06-01 11:49:05 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ToolbarItems
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \deprecated
     \brief Row of Items to be placed in a toolbar.

=== modified file 'src/Ubuntu/Components/1.3/UbuntuColors.qml'
--- src/Ubuntu/Components/1.3/UbuntuColors.qml	2016-01-22 19:51:10 +0000
+++ src/Ubuntu/Components/1.3/UbuntuColors.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype UbuntuColors
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Singleton defining the Ubuntu color palette.
 

=== modified file 'src/Ubuntu/Components/1.3/UbuntuListView.qml'
--- src/Ubuntu/Components/1.3/UbuntuListView.qml	2016-04-27 07:21:45 +0000
+++ src/Ubuntu/Components/1.3/UbuntuListView.qml	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype UbuntuListView
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \inherits ListView
     \brief A ListView with special features tailored for a look and feel fitting the

=== modified file 'src/Ubuntu/Components/1.3/UbuntuNumberAnimation.qml'
--- src/Ubuntu/Components/1.3/UbuntuNumberAnimation.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/UbuntuNumberAnimation.qml	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype UbuntuNumberAnimation
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief UbuntuNumberAnimation is a NumberAnimation that has predefined
            settings to ensure that Ubuntu applications are consistent in their animations.

=== modified file 'src/Ubuntu/Components/1.3/dateUtils.js'
--- src/Ubuntu/Components/1.3/dateUtils.js	2015-07-17 14:42:26 +0000
+++ src/Ubuntu/Components/1.3/dateUtils.js	2016-06-01 11:49:05 +0000
@@ -16,7 +16,7 @@
 
 /*!
   \qmltype dateUtils
-  \inqmlmodule Ubuntu.Components 1.3
+  \inqmlmodule Ubuntu.Components
   \ingroup ubuntu
   \brief Various date utility functions.
  */

=== modified file 'src/Ubuntu/Components/1.3/pageUtils.js'
--- src/Ubuntu/Components/1.3/pageUtils.js	2015-07-17 14:42:26 +0000
+++ src/Ubuntu/Components/1.3/pageUtils.js	2016-06-01 11:49:05 +0000
@@ -16,7 +16,7 @@
 
 /*!
   \qmltype pageUtils
-  \inqmlmodule Ubuntu.Components 1.3
+  \inqmlmodule Ubuntu.Components
   \ingroup ubuntu
   \internal
   \brief Page-related utility functions.

=== modified file 'src/Ubuntu/Components/Pickers/1.2/PickerPanel.qml'
--- src/Ubuntu/Components/Pickers/1.2/PickerPanel.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/Pickers/1.2/PickerPanel.qml	2016-06-01 11:49:05 +0000
@@ -23,7 +23,7 @@
 
 /*!
     \qmltype PickerPanel
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu-pickers
     \brief Provides a panel for opening a DatePicker in place of the input panel or
     as Popover, depending on the form factor.

=== modified file 'src/Ubuntu/Components/Pickers/1.3/PickerPanel.qml'
--- src/Ubuntu/Components/Pickers/1.3/PickerPanel.qml	2015-04-29 08:55:31 +0000
+++ src/Ubuntu/Components/Pickers/1.3/PickerPanel.qml	2016-06-01 11:49:05 +0000
@@ -23,7 +23,7 @@
 
 /*!
     \qmltype PickerPanel
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu-pickers
     \brief Provides a panel for opening a DatePicker in place of the input panel or
     as Popover, depending on the form factor.

=== modified file 'src/Ubuntu/Components/plugin/i18n.cpp'
--- src/Ubuntu/Components/plugin/i18n.cpp	2016-02-09 19:06:54 +0000
+++ src/Ubuntu/Components/plugin/i18n.cpp	2016-06-01 11:49:05 +0000
@@ -32,7 +32,7 @@
 /*!
  * \qmltype i18n
  * \instantiates UbuntuI18n
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief i18n is a context property that provides internationalization support.
  *

=== modified file 'src/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- src/Ubuntu/Components/plugin/inversemouseareatype.cpp	2016-02-01 18:57:26 +0000
+++ src/Ubuntu/Components/plugin/inversemouseareatype.cpp	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 /*!
   \qmltype InverseMouseArea
   \instantiates InverseMouseAreaType
-  \inqmlmodule Ubuntu.Components 1.1
+  \inqmlmodule Ubuntu.Components
   \ingroup ubuntu
   \brief The InverseMouseArea captures mouse events happening outside of a given
   area.

=== modified file 'src/Ubuntu/Components/plugin/livetimer.cpp'
--- src/Ubuntu/Components/plugin/livetimer.cpp	2015-08-12 09:56:33 +0000
+++ src/Ubuntu/Components/plugin/livetimer.cpp	2016-06-01 11:49:05 +0000
@@ -19,7 +19,7 @@
 
 /*! \qmltype LiveTimer
     \instantiates LiveTimer
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.3
     \brief A live timing source providing peridioc updates.

=== modified file 'src/Ubuntu/Components/plugin/privates/ucpagewrapper.cpp'
--- src/Ubuntu/Components/plugin/privates/ucpagewrapper.cpp	2016-02-19 13:00:26 +0000
+++ src/Ubuntu/Components/plugin/privates/ucpagewrapper.cpp	2016-06-01 11:49:05 +0000
@@ -456,7 +456,7 @@
 /*!
     \internal
     \qmltype PageWrapper
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Internal class used by \l PageStack
 */

=== modified file 'src/Ubuntu/Components/plugin/qquickclipboard.cpp'
--- src/Ubuntu/Components/plugin/qquickclipboard.cpp	2015-01-28 15:01:35 +0000
+++ src/Ubuntu/Components/plugin/qquickclipboard.cpp	2016-06-01 11:49:05 +0000
@@ -26,7 +26,7 @@
 /*!
  * \qmltype Clipboard
  * \instantiates QQuickClipboard
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief This is a singleton type providing access to the system clipboard.
  *

=== modified file 'src/Ubuntu/Components/plugin/qquickmimedata.cpp'
--- src/Ubuntu/Components/plugin/qquickmimedata.cpp	2014-04-23 08:50:20 +0000
+++ src/Ubuntu/Components/plugin/qquickmimedata.cpp	2016-06-01 11:49:05 +0000
@@ -28,7 +28,7 @@
 /*!
  * \qmltype MimeData
  * \instantiates QQuickMimeData
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief MimeData type provides interface to access and store data to the
  * Clipboard.

=== modified file 'src/Ubuntu/Components/plugin/sortfiltermodel.cpp'
--- src/Ubuntu/Components/plugin/sortfiltermodel.cpp	2015-09-14 17:34:00 +0000
+++ src/Ubuntu/Components/plugin/sortfiltermodel.cpp	2016-06-01 11:49:05 +0000
@@ -23,7 +23,7 @@
 /*!
  * \qmltype SortFilterModel
  * \instantiates QSortFilterProxyModelQML
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief SortFilterModel sorts and filters rows from an existing model.
  *

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-04-25 10:35:48 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-06-01 11:49:05 +0000
@@ -46,7 +46,7 @@
     \qmltype AbstractButton
     \instantiates UCAbstractButton
     \inherits ActionItem
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The AbstractButton class defines the behavior of the button.
 
@@ -217,7 +217,7 @@
     Q_EMIT q->pressAndHold();
 }
 
-// emit clicked when Enter/Return is pressed
+// emit clicked when Enter/Return/Space is pressed
 void UCAbstractButton::keyReleaseEvent(QKeyEvent *event)
 {
     UCActionItem::keyReleaseEvent(event);
@@ -226,6 +226,7 @@
         case Qt::Key_Enter:
         case Qt::Key_Return:
         case Qt::Key_Space:
+            event->accept();
             d_func()->onClicked();
             break;
         default:

=== modified file 'src/Ubuntu/Components/plugin/ucaction.cpp'
--- src/Ubuntu/Components/plugin/ucaction.cpp	2016-02-01 18:57:26 +0000
+++ src/Ubuntu/Components/plugin/ucaction.cpp	2016-06-01 11:49:05 +0000
@@ -84,7 +84,7 @@
 /*!
  * \qmltype Action
  * \instantiates UCAction
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief Describe an action that can be re-used and shared between different
  * components.

=== modified file 'src/Ubuntu/Components/plugin/ucactioncontext.cpp'
--- src/Ubuntu/Components/plugin/ucactioncontext.cpp	2016-01-12 14:22:30 +0000
+++ src/Ubuntu/Components/plugin/ucactioncontext.cpp	2016-06-01 11:49:05 +0000
@@ -33,7 +33,7 @@
 /*!
  * \qmltype ActionContext
  * \instantiates UCActionContext
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief ActionContext groups actions together and by providing multiple contexts
  * the developer is able to control the visibility of the actions. The \l ActionManager
@@ -256,7 +256,7 @@
 /*!
  * \qmltype PopupContext
  * \instantiates UCPopupContext
- * \inqmlmodule Ubuntu.Components 1.3
+ * \inqmlmodule Ubuntu.Components
  * \since Ubuntu.Components 1.3
  * \inherits ActionContext
  * \ingroup ubuntu

=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-12-21 17:49:59 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2016-06-01 11:49:05 +0000
@@ -38,7 +38,7 @@
 /*!
  * \qmltype ActionItem
  * \instantiates UCActionItem
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief A visual representation of an Action. The API of ActionItem is a
  * copy of the API of \l Action, with additional properties to define

=== modified file 'src/Ubuntu/Components/plugin/ucactionmanager.cpp'
--- src/Ubuntu/Components/plugin/ucactionmanager.cpp	2015-07-09 17:55:03 +0000
+++ src/Ubuntu/Components/plugin/ucactionmanager.cpp	2016-06-01 11:49:05 +0000
@@ -22,7 +22,7 @@
 /*!
  * \qmltype ActionManager
  * \instantiates UCActionManager
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief ActionManager manages actions and action contexts withion an application.
  *

=== modified file 'src/Ubuntu/Components/plugin/ucalarm.cpp'
--- src/Ubuntu/Components/plugin/ucalarm.cpp	2016-01-30 12:03:31 +0000
+++ src/Ubuntu/Components/plugin/ucalarm.cpp	2016-06-01 11:49:05 +0000
@@ -207,7 +207,7 @@
 /*!
  * \qmltype Alarm
  * \instantiates UCAlarm
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu-services
  * \brief Alarm component is a representation of an alarm event.
  *

=== modified file 'src/Ubuntu/Components/plugin/ucalarmmodel.cpp'
--- src/Ubuntu/Components/plugin/ucalarmmodel.cpp	2015-06-16 13:15:41 +0000
+++ src/Ubuntu/Components/plugin/ucalarmmodel.cpp	2016-06-01 11:49:05 +0000
@@ -27,7 +27,7 @@
 /*!
  * \qmltype AlarmModel
  * \instantiates UCAlarmModel
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu-services
  * \brief AlarmModel holds the list of alarms defined.
  *

=== modified file 'src/Ubuntu/Components/plugin/ucapplication.cpp'
--- src/Ubuntu/Components/plugin/ucapplication.cpp	2016-01-30 12:11:51 +0000
+++ src/Ubuntu/Components/plugin/ucapplication.cpp	2016-06-01 11:49:05 +0000
@@ -28,7 +28,7 @@
 /*!
  * \qmltype UbuntuApplication
  * \instantiates UCApplication
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief UbuntuApplication is a QML binding for a subset of QCoreApplication.
  *

=== modified file 'src/Ubuntu/Components/plugin/ucargument.cpp'
--- src/Ubuntu/Components/plugin/ucargument.cpp	2014-04-23 08:50:20 +0000
+++ src/Ubuntu/Components/plugin/ucargument.cpp	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 /*!
  * \qmltype Argument
  * \instantiates UCArgument
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu-commandline
  * \brief The Argument class specifies what type a given command line parameter should be.
  *

=== modified file 'src/Ubuntu/Components/plugin/ucarguments.cpp'
--- src/Ubuntu/Components/plugin/ucarguments.cpp	2016-01-30 12:03:31 +0000
+++ src/Ubuntu/Components/plugin/ucarguments.cpp	2016-06-01 11:49:05 +0000
@@ -28,7 +28,7 @@
 /*!
  * \qmltype Arguments
  * \instantiates UCArguments
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu-commandline
  * \brief The Arguments class provides a way to declare what command line
  *        parameters are expected by the application.

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-04-01 13:16:05 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-06-01 11:49:05 +0000
@@ -497,7 +497,7 @@
 /*!
  * \qmltype BottomEdge
  * \instantiates UCBottomEdge
- * \inqmlmodule Ubuntu.Components 1.3
+ * \inqmlmodule Ubuntu.Components
  * \inherits StyledItem
  * \ingroup ubuntu
  * \since Ubuntu.Components 1.3

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2016-06-01 11:49:05 +0000
@@ -71,7 +71,7 @@
 
 /*!
     \qmltype BottomEdgeHint
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \inherits ActionItem
     \brief The BottomEdgeHint shows the availability of extra features

=== modified file 'src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
--- src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2016-02-25 17:45:27 +0000
+++ src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2016-06-01 11:49:05 +0000
@@ -29,7 +29,7 @@
 /*!
     \qmltype Theme
     \instantiates UCTheme
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup theming
     \brief The Theme class provides facilities to interact with the current theme.
 

=== modified file 'src/Ubuntu/Components/plugin/ucfontutils.cpp'
--- src/Ubuntu/Components/plugin/ucfontutils.cpp	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/Components/plugin/ucfontutils.cpp	2016-06-01 11:49:05 +0000
@@ -23,7 +23,7 @@
 /*!
  * \qmltype FontUtils
  * \instantiates UCFontUtils
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief FontUtils is a \l {http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#details} {context property},
  * which provides utility functions for font manipulations.

=== modified file 'src/Ubuntu/Components/plugin/uchaptics.cpp'
--- src/Ubuntu/Components/plugin/uchaptics.cpp	2016-02-11 08:54:26 +0000
+++ src/Ubuntu/Components/plugin/uchaptics.cpp	2016-06-01 11:49:05 +0000
@@ -23,7 +23,7 @@
 /*!
   \qmltype Haptics
   \instantiates UCHaptics
-  \inqmlmodule Ubuntu.Components 1.1
+  \inqmlmodule Ubuntu.Components
   \ingroup ubuntu-services
   \brief Singleton defining the haptics feedback used in components, where execution
   of the feedback is controlled by the system settings.

=== modified file 'src/Ubuntu/Components/plugin/ucheader.cpp'
--- src/Ubuntu/Components/plugin/ucheader.cpp	2016-05-11 21:17:26 +0000
+++ src/Ubuntu/Components/plugin/ucheader.cpp	2016-06-01 11:49:05 +0000
@@ -26,7 +26,7 @@
     \qmltype Header
     \instantiates UCHeader
     \inherits StyledItem
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.3
     \brief Header bar that can contain the title and controls for the current view.

=== modified file 'src/Ubuntu/Components/plugin/uclabel.cpp'
--- src/Ubuntu/Components/plugin/uclabel.cpp	2016-04-26 14:05:01 +0000
+++ src/Ubuntu/Components/plugin/uclabel.cpp	2016-06-01 11:49:05 +0000
@@ -65,9 +65,10 @@
 }
 
 /*!
- * \qmltype LabelBase
+ * \qmltype Label
  * \qmlabstract
  * \instantiates UCLabel
+ * \inherits Text
  * \inqmlmodule Ubuntu.Components 1.3
  * \ingroup ubuntu
  * \brief Extended Text item with Ubuntu styling.
@@ -158,7 +159,7 @@
 }
 
 /*!
- * \qmlproperty enumeration LabelBase::textSize
+ * \qmlproperty enumeration Label::textSize
  * \since Ubuntu.Components 1.3
  *
  * This property holds an abstract size that allows adaptive resizing based on the measurement unit
@@ -221,7 +222,7 @@
 }
 
 /*!
- * \qmlproperty string LabelBase::fontSize
+ * \qmlproperty string Label::fontSize
  * \deprecated
  *
  * This property holds an abstract size represented as a string that allows adaptive resizing based

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2016-04-27 07:59:22 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2016-06-01 11:49:05 +0000
@@ -519,7 +519,7 @@
 /*!
  * \qmltype ListItem
  * \instantiates UCListItem
- * \inqmlmodule Ubuntu.Components 1.2
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu-listitem
  * \since Ubuntu.Components 1.2
  * \brief The ListItem element provides Ubuntu design standards for list or grid

=== modified file 'src/Ubuntu/Components/plugin/uclistitemactions.cpp'
--- src/Ubuntu/Components/plugin/uclistitemactions.cpp	2015-03-03 13:47:48 +0000
+++ src/Ubuntu/Components/plugin/uclistitemactions.cpp	2016-06-01 11:49:05 +0000
@@ -38,7 +38,7 @@
  * \qmltype ListItemActions
  * \instantiates UCListItemActions
  * \inherits QtQObject
- * \inqmlmodule Ubuntu.Components 1.2
+ * \inqmlmodule Ubuntu.Components
  * \since Ubuntu.Components 1.2
  * \ingroup ubuntu-listitem
  * \brief Provides configuration for actions to be added to a ListItem.

=== modified file 'src/Ubuntu/Components/plugin/uclistitemlayout.cpp'
--- src/Ubuntu/Components/plugin/uclistitemlayout.cpp	2016-01-07 18:23:51 +0000
+++ src/Ubuntu/Components/plugin/uclistitemlayout.cpp	2016-06-01 11:49:05 +0000
@@ -26,7 +26,7 @@
 /*!
     \qmltype ListItemLayout
     \instantiates UCListItemLayout
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \since Ubuntu.Components 1.3
     \inherits SlotsLayout
     \ingroup ubuntu

=== modified file 'src/Ubuntu/Components/plugin/ucmainviewbase.cpp'
--- src/Ubuntu/Components/plugin/ucmainviewbase.cpp	2016-05-02 21:51:23 +0000
+++ src/Ubuntu/Components/plugin/ucmainviewbase.cpp	2016-06-01 11:49:05 +0000
@@ -31,7 +31,7 @@
 /*!
   \internal
   \qmlabstract MainViewBase
-  \inqmlmodule Ubuntu.Components 1.3
+  \inqmlmodule Ubuntu.Components
   \ingroup ubuntu
   \brief The base class for MainView and MultiColumnView.
 */

=== modified file 'src/Ubuntu/Components/plugin/ucmousefilters.cpp'
--- src/Ubuntu/Components/plugin/ucmousefilters.cpp	2016-04-05 19:47:18 +0000
+++ src/Ubuntu/Components/plugin/ucmousefilters.cpp	2016-06-01 11:49:05 +0000
@@ -58,7 +58,7 @@
 /*!
    \qmltype Mouse
    \instantiates UCMouse
-   \inqmlmodule Ubuntu.Components 1.1
+   \inqmlmodule Ubuntu.Components
    \ingroup ubuntu
    \brief Attached property filtering mouse events occured inside the owner.
 
@@ -1015,7 +1015,7 @@
 /*!
    \qmltype InverseMouse
    \instantiates UCInverseMouse
-   \inqmlmodule Ubuntu.Components 1.1
+   \inqmlmodule Ubuntu.Components
    \ingroup ubuntu
    \brief Attached object filtering mouse events occured outside the owner.
 

=== modified file 'src/Ubuntu/Components/plugin/ucnamespace.cpp'
--- src/Ubuntu/Components/plugin/ucnamespace.cpp	2015-04-25 07:10:57 +0000
+++ src/Ubuntu/Components/plugin/ucnamespace.cpp	2016-06-01 11:49:05 +0000
@@ -20,7 +20,7 @@
 /*!
  * \qmltype Ubuntu
  * \instantiates UCNamespace
- * \inqmlmodule Ubuntu.Components 1.2
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \since Ubuntu.Components 1.2
  * \brief Provides global object with different enums.

=== modified file 'src/Ubuntu/Components/plugin/ucpagetreenode.cpp'
--- src/Ubuntu/Components/plugin/ucpagetreenode.cpp	2016-02-04 14:53:47 +0000
+++ src/Ubuntu/Components/plugin/ucpagetreenode.cpp	2016-06-01 11:49:05 +0000
@@ -360,7 +360,7 @@
 /*!
     \internal
     \qmltype PageTreeNode
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs.
 

=== modified file 'src/Ubuntu/Components/plugin/ucproportionalshape.cpp'
--- src/Ubuntu/Components/plugin/ucproportionalshape.cpp	2016-02-17 19:32:41 +0000
+++ src/Ubuntu/Components/plugin/ucproportionalshape.cpp	2016-06-01 11:49:05 +0000
@@ -23,7 +23,7 @@
 
 /*! \qmltype ProportionalShape
     \instantiates UCProportionalShape
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Extended UbuntuShape mostly used for icons and vignettes.
 

=== modified file 'src/Ubuntu/Components/plugin/ucserviceproperties.cpp'
--- src/Ubuntu/Components/plugin/ucserviceproperties.cpp	2016-01-30 12:03:31 +0000
+++ src/Ubuntu/Components/plugin/ucserviceproperties.cpp	2016-06-01 11:49:05 +0000
@@ -80,7 +80,7 @@
 /*!
  * \qmltype ServiceProperties
  * \instantiates UCServiceProperties
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \since Ubuntu.Components 1.1
  * \ingroup ubuntu-services
  * \brief The component enables accessing service properties from QML.

=== modified file 'src/Ubuntu/Components/plugin/ucslotslayout.cpp'
--- src/Ubuntu/Components/plugin/ucslotslayout.cpp	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/Components/plugin/ucslotslayout.cpp	2016-06-01 11:49:05 +0000
@@ -597,7 +597,7 @@
 /*!
     \qmltype SlotsLayout
     \instantiates UCSlotsLayout
-    \inqmlmodule Ubuntu.Components 1.3
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu-slotslayout
     \inherits Item
     \since Ubuntu.Components 1.3

=== modified file 'src/Ubuntu/Components/plugin/ucstatesaver.cpp'
--- src/Ubuntu/Components/plugin/ucstatesaver.cpp	2016-02-01 18:57:26 +0000
+++ src/Ubuntu/Components/plugin/ucstatesaver.cpp	2016-06-01 11:49:05 +0000
@@ -146,7 +146,7 @@
 /*!
  * \qmltype StateSaver
  * \instantiates UCStateSaverAttached
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu-services
  * \brief Attached properties to save component property states.
  *

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2016-04-27 09:20:29 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2016-06-01 11:49:05 +0000
@@ -130,7 +130,7 @@
 /*!
  * \qmltype StyledItem
  * \instantiates UCStyledItemBase
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \since Ubuntu.Components 1.1
  * \brief The StyledItem class allows items to be styled by the theme.

=== modified file 'src/Ubuntu/Components/plugin/uctheme.cpp'
--- src/Ubuntu/Components/plugin/uctheme.cpp	2016-04-15 14:57:05 +0000
+++ src/Ubuntu/Components/plugin/uctheme.cpp	2016-06-01 11:49:05 +0000
@@ -49,7 +49,7 @@
 /*!
  * \qmltype ThemeSettings
  * \instantiates UCTheme
- * \inqmlmodule Ubuntu.Components 1.3
+ * \inqmlmodule Ubuntu.Components
  * \since Ubuntu.Components 1.3
  * \ingroup theming
  * \brief The ThemeSettings class provides facilities to define the theme of a

=== modified file 'src/Ubuntu/Components/plugin/ucubuntuanimation.cpp'
--- src/Ubuntu/Components/plugin/ucubuntuanimation.cpp	2014-04-23 08:50:20 +0000
+++ src/Ubuntu/Components/plugin/ucubuntuanimation.cpp	2016-06-01 11:49:05 +0000
@@ -21,7 +21,7 @@
 /*!
  * \qmltype UbuntuAnimation
  * \instantiates UCUbuntuAnimation
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief Singleton defining standard Ubuntu durations and easing for animations
  *        that should be used to ensure that Ubuntu applications are consistent

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- src/Ubuntu/Components/plugin/ucubuntushape.cpp	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.cpp	2016-06-01 11:49:05 +0000
@@ -255,7 +255,7 @@
 
 /*! \qmltype UbuntuShape
     \instantiates UCUbuntuShape
-    \inqmlmodule Ubuntu.Components 1.2
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Rounded rectangle containing a source image blended over a background color.
 

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp'
--- src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-09-25 09:44:34 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2016-06-01 11:49:05 +0000
@@ -97,7 +97,7 @@
 
 /*! \qmltype UbuntuShapeOverlay
     \instantiates UCUbuntuShapeOverlay
-    \inqmlmodule Ubuntu.Components 1.2
+    \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \brief Extended UbuntuShape adding a colored overlay layer.
 

=== modified file 'src/Ubuntu/Components/plugin/ucunits.cpp'
--- src/Ubuntu/Components/plugin/ucunits.cpp	2016-04-21 16:02:05 +0000
+++ src/Ubuntu/Components/plugin/ucunits.cpp	2016-06-01 11:49:05 +0000
@@ -46,7 +46,7 @@
 /*!
     \qmltype Units
     \instantiates UCUnits
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components
     \ingroup resolution-independence
     \brief Units of measurement for sizes, spacing, margin, etc.
 

=== modified file 'src/Ubuntu/Components/plugin/ucurihandler.cpp'
--- src/Ubuntu/Components/plugin/ucurihandler.cpp	2014-10-08 20:16:03 +0000
+++ src/Ubuntu/Components/plugin/ucurihandler.cpp	2016-06-01 11:49:05 +0000
@@ -36,7 +36,7 @@
 /*!
  * \qmltype UriHandler
  * \instantiates UCUriHandler
- * \inqmlmodule Ubuntu.Components 1.1
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief Singleton signalling for opened URIs.
  *

=== modified file 'src/Ubuntu/Components/plugin/ucviewitemsattached.cpp'
--- src/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2016-02-24 06:45:27 +0000
+++ src/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2016-06-01 11:49:05 +0000
@@ -33,7 +33,7 @@
 
 /*!
  * \qmltype ListItemDrag
- * \inqmlmodule Ubuntu.Components 1.2
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu-listitem
  * \since Ubuntu.Components 1.2
  * \brief Provides information about a ListItem drag event.
@@ -173,7 +173,7 @@
 /*!
  * \qmltype ViewItems
  * \instantiates UCViewItemsAttached
- * \inqmlmodule Ubuntu.Components 1.2
+ * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu-listitem
  * \since Ubuntu.Components 1.2
  * \brief A set of properties attached to the ListItem's parent item or ListView.

=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea.cpp'
--- src/Ubuntu/UbuntuGestures/ucswipearea.cpp	2016-03-04 17:34:48 +0000
+++ src/Ubuntu/UbuntuGestures/ucswipearea.cpp	2016-06-01 11:49:05 +0000
@@ -130,7 +130,7 @@
  * \qmltype SwipeArea
  * \instantiates UCSwipeArea
  * \inherits Item
- * \inqmlmodule Ubuntu.Components 1.3
+ * \inqmlmodule Ubuntu.Components
  * \since Ubuntu.Components 1.3
  * \ingroup ubuntu-gestures
  * \brief An area which detects axis-aligned single-finger drag gestures.

=== modified file 'tests/unit_x11/tst_components/tst_focus.qml'
--- tests/unit_x11/tst_components/tst_focus.qml	2016-04-26 13:21:53 +0000
+++ tests/unit_x11/tst_components/tst_focus.qml	2016-06-01 11:49:05 +0000
@@ -28,6 +28,9 @@
 
     property bool hasOSK: false
 
+    property bool keysReleased
+    Keys.onReleased: keysReleased = true
+
     Flow {
         anchors {
             fill: parent
@@ -75,6 +78,8 @@
         Button {
             id: button
             text: "Press me"
+            property bool override: false
+            Keys.onReleased: event.accepted = override
         }
         CheckBox {
             id: checkbox
@@ -426,10 +431,23 @@
             ];
         }
         function test_button_trigger_via_keyboard(data) {
+            button.override = false;
+            main.keysReleased = false;
+            buttonTriggerSpy.clear();
             buttonTriggerSpy.target = button;
             button.forceActiveFocus();
             keyClick(data.key);
             buttonTriggerSpy.wait();
+            compare(main.keysReleased, false, "Parent didn't get Keys.onReleased");
+
+            // Second attempt but the button will consume Keys.onReleased
+            button.override = true;
+            main.keysReleased = false;
+            buttonTriggerSpy.clear();
+            keyClick(data.key);
+            expectFailContinue(data.tag, "Trigger should've been overridden");
+            buttonTriggerSpy.wait();
+            compare(main.keysReleased, false, "Parent didn't get Keys.onReleased");
         }
 
         function test_disabled_component_does_not_focus() {

=== modified file 'tests/unit_x11/tst_components/tst_slotslayout.qml'
--- tests/unit_x11/tst_components/tst_slotslayout.qml	2016-01-27 06:39:09 +0000
+++ tests/unit_x11/tst_components/tst_slotslayout.qml	2016-06-01 11:49:05 +0000
@@ -887,11 +887,12 @@
             id: layoutTestQmlContextComponent
             ListItemLayout {
                 id: layoutTestQmlContext
-                title.text: "<html><body><p dir='ltr'>TEST <img align=absmiddle height=\"10\" width=\"10\" src=\"file:///test.png\" /> </p></body></html>"
+		property string testingText: "<html><body><p dir='ltr'>TEST <img align=absmiddle height=\"10\" width=\"10\" src=\"file:///test.png\" /> </p></body></html>"
+                title.text: testingText
                 title.textFormat: Text.RichText
-                subtitle.text: "<html><body><p dir='ltr'>TEST <img align=absmiddle height=\"10\" width=\"10\" src=\"file:///test.png\" /> </p></body></html>"
+                subtitle.text: testingText
                 subtitle.textFormat: Text.RichText
-                summary.text: "<html><body><p dir='ltr'>TEST <img align=absmiddle height=\"10\" width=\"10\" src=\"file:///test.png\" /> </p></body></html>"
+                summary.text: testingText
                 summary.textFormat: Text.RichText
             }
         }
@@ -904,6 +905,14 @@
             //because the img is loaded async
             waitForRendering(obj)
             compare(obj !== null, true, "QML ListItemLayout: testing labels' QML context.")
+
+            //Tentative fix for lp:1571426, CI once (in months) managed to fail this test because
+            //the warning was received after the test had already finished.
+            //The fail could not be reproduced locally.
+            tryCompare(obj.title, "text", obj.testingText)
+            tryCompare(obj.subtitle, "text", obj.testingText)
+            tryCompare(obj.summary, "text", obj.testingText)
+
             obj.destroy()
         }