Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/uitk-12-doc into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Final move to 1.2 release and doc fixes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1436
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1513/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/243
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/240
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1444
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1627
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1627/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18512

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1513/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'components.api'
--- components.api	2015-02-27 13:47:29 +0000
+++ components.api	2015-03-03 15:01:13 +0000
@@ -34,6 +34,11 @@
     property Gradient gradient
     property font font
     property string iconPosition
+Captions 1.2
+ColumnLayout
+    property int captionStyle
+    property Label title
+    property Label subtitle
 CheckBox 0.1 1.0
 AbstractButton
     property bool checked
@@ -1007,6 +1012,10 @@
     name: "exited"
     Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
     Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
+    name: "UCNamespace"
+    prototype: "QObject"
+    exports: ["Ubuntu 1.2"]
+    name: "CaptionsStyle"
     name: "UCQQuickImageExtension"
     prototype: "QQuickImageBase"
     exports: ["QQuickImageBase 0.1", "QQuickImageBase 1.0"]
 
=== modified file 'debian/control'
--- debian/control	2015-02-25 14:25:59 +0000
+++ debian/control	2015-03-03 15:01:13 +0000
@@ -20,6 +20,7 @@
                qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
                qml-module-qttest | qtdeclarative5-test-plugin,
                qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
+               qml-module-qtquick-layouts,
                qtdeclarative5-qtfeedback-plugin,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
                qml-module-qtquick-localstorage | qtdeclarative5-localstorage-plugin,
@@ -62,6 +63,7 @@
          libqt5svg5,
          qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
          qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
+         qml-module-qtquick-layouts,
          qtdeclarative5-qtfeedback-plugin,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
          suru-icon-theme,
 
=== modified file 'documentation/css/base.css'
--- documentation/css/base.css	2012-12-20 08:38:03 +0000
+++ documentation/css/base.css	2015-03-03 15:01:13 +0000
@@ -37,7 +37,7 @@
 	padding: 10px;
 	font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
 	background-color: #fdf6f2;
-	display: block;
+	display: inline-block;
 	margin-bottom: 10px;
 		-moz-border-radius: 4px;
 		-webkit-border-radius: 4px;
 
=== modified file 'documentation/docs.sh'
--- documentation/docs.sh	2014-11-25 16:28:04 +0000
+++ documentation/docs.sh	2015-03-03 15:01:13 +0000
@@ -45,8 +45,6 @@
 qdoc $SRC/ubuntu-ui-toolkit-online-indexes.qdocconf 2> /dev/null
 echo docs: Cross-referenced done.
 
-sed -r -i 's@("main-content">)@\1<ul class="breadcrumb">@g' $1/html/*.html
-sed -r -i 's@(<div class="toc">|<h1 class="title">)@</ul>\1@g' $1/html/*.html
 sed -r -i 's@(</p>)<p/>@\1@g' $1/html/*.html
 sed -r -i 's@(<a class="(next|prev)Page" href=".+">)(.+)(</a>)@<li>\1\3\4</li>@g' $1/html/*.html
 sed -r -i 's@(href="qmlmodule-ubuntu-components0-ubuntu-components-0-1.html">Basic QML Types)@href="overview-ubuntu-sdk.html">Ubuntu User Interface Toolkit@g' $1/html/*.html
 
=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2014-09-15 12:59:16 +0000
+++ documentation/overview.qdoc	2015-03-03 15:01:13 +0000
@@ -20,6 +20,7 @@
 
      \part General Topics
      \list
+     \li \l{ubuntu-whatsnew.html}{What's new in version 1.2?}
      \li \l{ubuntu-layouts.html}{Layouts} describes a flexible layouting engine
      to ease the development of responsive user interfaces.
      \li \l {Resolution Independence} describes the facilities that should be
@@ -31,11 +32,24 @@
      \part Basic QML Types
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist ubuntu
 
-     \part List Items
+     \part List views, list items
+     Components with standardized view items, with conditional actions, multiselect
+     and reordering support on scrollable views. Replaces the Ubuntu.Components.ListItems
+     module components.
+
+     Available through:
+     \code
+         import Ubuntu.Components 1.2
+     \endcode
+     \annotatedlist ubuntu-listitem
+
+     \part List Items module - deprecated
+     This module contains the old set of list items.
+
      Available through:
      \code
          import Ubuntu.Components.ListItems 1.0
@@ -66,7 +80,7 @@
      \part Theming Elements
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist theming
 
@@ -75,28 +89,28 @@
      Themes must make sure that these interfaces are all implemented.
      Available through:
      \code
-         import Ubuntu.Components.Styles 1.1
+         import Ubuntu.Components.Styles 1.2
      \endcode
      \annotatedlist style-api
 
      \part Resolution Independence Items
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist resolution-independence
 
      \part Parsing Command-Line Arguments
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist ubuntu-commandline
 
      \part Services
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist ubuntu-services
 
@@ -113,9 +127,4 @@
          import Ubuntu Test 1.0
      \endcode
      \annotatedlist ubuntu-test
-
-     \part Unstable QML Types
-     The following section lists components which will be part of future releases.
-     Their interface is unstable and thus should not be used in production applications.
-     \annotatedlist unstable-ubuntu-listitems
  */
 
=== modified file 'documentation/resolution-independence.qdoc'
--- documentation/resolution-independence.qdoc	2014-04-23 08:50:20 +0000
+++ documentation/resolution-independence.qdoc	2015-03-03 15:01:13 +0000
@@ -64,7 +64,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
 
     Item {
         width: units.gu(2)
@@ -79,7 +79,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
 
     Rectangle {
         height: units.dp(1)
@@ -143,7 +143,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
 
     Label {
         fontSize: "small"
 
=== modified file 'documentation/snippets/layouts/SimpleLayout.qml'
--- documentation/snippets/layouts/SimpleLayout.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/SimpleLayout.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {
 
=== modified file 'documentation/snippets/layouts/layout1.qml'
--- documentation/snippets/layouts/layout1.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout1.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {
 
=== modified file 'documentation/snippets/layouts/layout2.qml'
--- documentation/snippets/layouts/layout2.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout2.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {
 
=== modified file 'documentation/snippets/layouts/layout3.qml'
--- documentation/snippets/layouts/layout3.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout3.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {
 
=== modified file 'documentation/snippets/layouts/layout6.qml'
--- documentation/snippets/layouts/layout6.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout6.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {
 
=== modified file 'documentation/snippets/layouts/layout7.qml'
--- documentation/snippets/layouts/layout7.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout7.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {
 
=== modified file 'documentation/snippets/statesaver/ColorChanger.qml'
--- documentation/snippets/statesaver/ColorChanger.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/statesaver/ColorChanger.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  */
 
 //![color-saver]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: root
 
=== modified file 'documentation/snippets/statesaver/MultiplePropertySaver.qml'
--- documentation/snippets/statesaver/MultiplePropertySaver.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/statesaver/MultiplePropertySaver.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  */
 
 //![group-saver]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: root
 
=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  */
 
 //![property-group-saver]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: root
 
=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver2.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver2.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver2.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  */
 
 //![property-group-saver]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: root
 
=== modified file 'documentation/ubuntu-components.qdoc'
--- documentation/ubuntu-components.qdoc	2014-04-23 08:50:20 +0000
+++ documentation/ubuntu-components.qdoc	2015-03-03 15:01:13 +0000
@@ -15,7 +15,7 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components 1.1
+    \qmlmodule Ubuntu.Components 1.2
     \title Basic QML Types
     \nextpage {Ubuntu User Interface Toolkit}
 */
 
=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2015-01-27 11:27:37 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2015-03-03 15:01:13 +0000
@@ -1,5 +1,5 @@
 project = UbuntuUserInterfaceToolkit
-url = http://developer.ubuntu.com/api/ubuntu-12.10/qml/mobile/
+url = http://developer.ubuntu.com/api/ubuntu-15.04/qml/mobile/
 description = Ubuntu User Interface Toolkit Documentation
 sourcedirs = ./
 sourcedirs += ../modules/Ubuntu/Components
@@ -19,7 +19,7 @@
 excludefiles = $BLD/../modules/Ubuntu/Components/MainView.qml
 outputdir = $BLD/html
 outputformats = HTML
-version = 1.1
+version = 1.2
 syntaxhighlighting = true
 sourceencoding = UTF-8
 outputencoding = UTF-8
 
=== added file 'documentation/ubuntu-whatsnew.qdoc'
--- documentation/ubuntu-whatsnew.qdoc	1970-01-01 00:00:00 +0000
+++ documentation/ubuntu-whatsnew.qdoc	2015-03-03 15:01:13 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 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/>.
+ */
+
+/*!
+ * \page ubuntu-whatsnew.html ubuntu-whatsnew
+ * \title What's new in the version 1.2?
+ *
+ * Beside the pile of bug fixes we have two major changes in the UI Toolkit version 1.2,
+ * as follows:
+ *
+ * \section3 MainView.useDeprecatedToolbar
+ * MainView.useDeprecatedToolbar property \b {got removed} and the new header is always
+ * enabled. If you need to use the old toolbar you can still do that by importing \b
+ * Ubuntu.Components 1.1.
+ *
+ * \section3 A new performant ListItem component
+ * As of 1.2, a new ListItem component and its attached components were added to the toolkit,
+ * which gives more flexibility and performance when used with scrollable views like ListView
+ * or Flickable. Its layout is free, meaning developers can, and have to implement their layout
+ * themselves. The only helper the toolkit provides is the Captions component, which fulfills
+ * the two typical use cases, for the two label column title captioning and for the summary
+ * captions.
+ *
+ * \section3 Ubuntu.Components.ListItems module deprecated
+ * The new ListItem also made the old list items module to be redundant, therefore we marked them
+ * for deprecation. Which means that your application should migrate to the new ListItem as soon as
+ * possible. There are few components which were not marked as deprecated, like ThinDivider, Header,
+ * Expandable and ExpandableColumn were not deprecated.
+ *
+ * \section3 UbuntuShape facelift
+ * There were few properties added and marked to be deprecated as well in UbuntuShape. Some most
+ * wanted features were added, and optimized.
+ */
 
=== modified file 'examples/calculator/calculator.qml'
--- examples/calculator/calculator.qml	2014-05-13 15:15:57 +0000
+++ examples/calculator/calculator.qml	2015-03-03 15:01:13 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 import "components"
 import "components/calculator.js" as Calculator
 
=== modified file 'examples/calculator/components/DefaultLayout.qml'
--- examples/calculator/components/DefaultLayout.qml	2014-05-13 15:15:57 +0000
+++ examples/calculator/components/DefaultLayout.qml	2015-03-03 15:01:13 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {
 
=== modified file 'examples/calculator/components/Functions.qml'
--- examples/calculator/components/Functions.qml	2014-05-13 15:15:57 +0000
+++ examples/calculator/components/Functions.qml	2015-03-03 15:01:13 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Grid {
 
=== modified file 'examples/customtheme/main.qml'
--- examples/customtheme/main.qml	2014-12-04 07:18:58 +0000
+++ examples/customtheme/main.qml	2015-03-03 15:01:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 /*!
     \brief MainView with a Label and Button elements.
@@ -35,9 +35,6 @@
     */
     //automaticOrientation: true
 
-    // Removes the old toolbar and enables new features of the new header.
-    useDeprecatedToolbar: false
-
     width: units.gu(100)
     height: units.gu(75)
 
 
=== modified file 'examples/customtheme/theme/Palette.qml'
--- examples/customtheme/theme/Palette.qml	2014-12-04 07:18:58 +0000
+++ examples/customtheme/theme/Palette.qml	2015-03-03 15:01:13 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Themes.SuruDark 1.1 as Suru
 
 Suru.Palette {
 
=== modified file 'examples/jokes/jokes.qml'
--- examples/jokes/jokes.qml	2014-04-23 08:50:20 +0000
+++ examples/jokes/jokes.qml	2015-03-03 15:01:13 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import QtMultimedia 5.0
 
 /*!
 
=== modified file 'examples/locale/locale.qml'
--- examples/locale/locale.qml	2014-04-23 08:50:20 +0000
+++ examples/locale/locale.qml	2015-03-03 15:01:13 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 /*!
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-07-30 12:59:34 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 
 Template {
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2014-07-02 11:41:18 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Template {
     objectName: "colorsTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml'
--- examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml	2014-07-02 11:11:53 +0000
+++ examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Template {
     objectName: "crossFadeImagesTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Dialog.qml'
--- examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2014-07-25 12:55:27 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-03-03 15:01:13 +0000
@@ -14,9 +14,9 @@
  * 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 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 
 Template {
     objectName: "dialogsTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2014-07-18 12:12:05 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-03-03 15:01:13 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Toolkit
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Template {
     objectName: "listItemsTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml'
--- examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2014-06-17 13:04:52 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Template {
     objectName: "progressBarsTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Styles.qml'
--- examples/ubuntu-ui-toolkit-gallery/Styles.qml	2014-07-21 11:14:11 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Styles.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.1
 
 Template {
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml'
--- examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2014-06-27 06:46:16 +0000
+++ examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Template {
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-02-25 20:02:36 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.1 // keep 1.1 till we remove the deprecated toolbar and toolbar in general
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 MainView {
 
=== modified file 'examples/unit-converter/unit-converter.qml'
--- examples/unit-converter/unit-converter.qml	2014-04-23 08:50:20 +0000
+++ examples/unit-converter/unit-converter.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "conversion.js" as Converter
 
 /*!
 
=== modified file 'modules/Ubuntu/Components/10/Button.qml'
--- modules/Ubuntu/Components/10/Button.qml	2014-07-29 14:42:56 +0000
+++ modules/Ubuntu/Components/10/Button.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
    \internal
 
=== modified file 'modules/Ubuntu/Components/10/UbuntuColors10.qml'
--- modules/Ubuntu/Components/10/UbuntuColors10.qml	2014-09-03 08:17:24 +0000
+++ modules/Ubuntu/Components/10/UbuntuColors10.qml	2015-03-03 15:01:13 +0000
@@ -15,7 +15,7 @@
  */
 
 pragma Singleton
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*!
     \internal
 
=== modified file 'modules/Ubuntu/Components/11/Button.qml'
--- modules/Ubuntu/Components/11/Button.qml	2014-07-28 19:27:17 +0000
+++ modules/Ubuntu/Components/11/Button.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Button
 
=== modified file 'modules/Ubuntu/Components/11/Haptics.qml'
--- modules/Ubuntu/Components/11/Haptics.qml	2015-01-29 06:18:22 +0000
+++ modules/Ubuntu/Components/11/Haptics.qml	2015-03-03 15:01:13 +0000
@@ -15,9 +15,9 @@
  */
 
 pragma Singleton
-import QtQuick 2.0
+import QtQuick 2.4
 import QtFeedback 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 /*!
   \qmltype Haptics
@@ -32,8 +32,8 @@
 
   Example of using Haptics:
   \qml
-  import QtQuick 2.3
-  import Ubuntu.Components 1.1
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
 
   Item {
       implicitWidth: units.gu(20)
@@ -54,8 +54,8 @@
 
   Custom effects can be played as follows:
   \qml
-  import QtQuick 2.3
-  import Ubuntu.Components 1.1
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
 
   Item {
       implicitWidth: units.gu(20)
 
=== modified file 'modules/Ubuntu/Components/11/UbuntuColors.qml'
--- modules/Ubuntu/Components/11/UbuntuColors.qml	2014-09-03 08:17:24 +0000
+++ modules/Ubuntu/Components/11/UbuntuColors.qml	2015-03-03 15:01:13 +0000
@@ -15,7 +15,7 @@
  */
 
 pragma Singleton
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*!
     \qmltype UbuntuColors
 
=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
--- modules/Ubuntu/Components/AbstractButton.qml	2015-02-10 16:47:59 +0000
+++ modules/Ubuntu/Components/AbstractButton.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmlabstract AbstractButton
 
=== modified file 'modules/Ubuntu/Components/ActionItem.qml'
--- modules/Ubuntu/Components/ActionItem.qml	2014-08-31 19:24:19 +0000
+++ modules/Ubuntu/Components/ActionItem.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmlabstract ActionItem
 
=== modified file 'modules/Ubuntu/Components/ActionList.qml'
--- modules/Ubuntu/Components/ActionList.qml	2014-08-31 19:24:19 +0000
+++ modules/Ubuntu/Components/ActionList.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ActionList
 
=== modified file 'modules/Ubuntu/Components/ActivityIndicator.qml'
--- modules/Ubuntu/Components/ActivityIndicator.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/ActivityIndicator.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ActivityIndicator
 
=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2014-11-18 12:02:55 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2015-03-03 15:01:13 +0000
@@ -24,7 +24,7 @@
 
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 StyledItem {
     id: root
 
=== modified file 'modules/Ubuntu/Components/AppHeader.qml'
--- modules/Ubuntu/Components/AppHeader.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/AppHeader.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Components
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Components
 
 /*!
     \internal
 
=== added file 'modules/Ubuntu/Components/Captions.qml'
--- modules/Ubuntu/Components/Captions.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Captions.qml	2015-03-03 15:01:13 +0000
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2015 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.4
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.2
+
+/*!
+  \qmltype Captions
+  \inqmlmodule Ubuntu.Components 1.2
+  \ingroup ubuntu-listitem
+  \since Ubuntu.Components 1.2
+  \brief Container providing captionStyles for a twin-label column that can be used in
+  RowLayout or GridLayout.
+
+  The labels are placed in a column and can be accessed through \l title and
+  \l subtitle properties. The default spacing between the labels is 0.5 grid units.
+
+  The container only shows the labels which has its text property set to a valid
+  string. The labels not having any text set are not occupying the space. When
+  embedded in a positioner or in a RowLayout, the container is aligned vertically
+  centered. It is recommended to be used in context with RowLayout or GridLayout,
+  however can be used with any component.
+
+  \qml
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
+
+  ListItem {
+      RowLayout {
+           Captions {
+               title.text: "Caption"
+               subtitle.text: "Subtitle text"
+               // attached properties of an Item type property
+               // can be changed only with assignment
+               Component.onCompleted: subtitle.Layout.alignment = Qt.AlignRight
+           }
+           Captions {
+               captionStyle: Ubuntu.SummaryCaptionStyle
+               title.text: "Text"
+               subtitle.text: "Text"
+           }
+      }
+  }
+  \endqml
+
+  Additional items can also be added to the layout after the two labels.
+  \qml
+  Captions {
+      title.text: "Caption"
+      subtitle.text: "Subtitle"
+      Label {
+          text: "third line"
+          fontSize: "xx-small"
+      }
+  }
+  \endqml
+  */
+ColumnLayout {
+    id: captions
+
+    /*!
+      \qmlproperty enumeration captionStyle
+      The property configures the arrangement and font sizes of the Labels in the
+      component. It can take the following values:
+      \list
+        \li \b Ubuntu.TitleCaptionStyle - (default) typical configuration for a left aligned
+            twin-label setup, where the text covers the remaining area on a list
+            layout.
+        \li \b Ubuntu.SummaryCaptionStyle - configuration for a right-aligned twin label setup,
+            with 6 grid units width.
+      \endlist
+      */
+    property int captionStyle: Ubuntu.TitleCaptionStyle
+
+    /*!
+      \qmlproperty Label title
+      \readonly
+      Label occupying the top area of the container.
+      */
+    property alias title: titleLabel
+
+    /*!
+      \qmlproperty Label subtitle
+      \readonly
+      Label occupying the bottom area of the container.
+      */
+    property alias subtitle: subtitleLabel
+
+    clip: true
+    spacing: units.gu(0.5)
+    Layout.fillWidth: (captionStyle == Ubuntu.TitleCaptionStyle)
+    Layout.alignment: Qt.AlignVCenter | ((captionStyle == Ubuntu.SummaryCaptionStyle) ? Qt.AlignRight : Qt.AlignLeft)
+    Layout.minimumWidth: 0
+    Layout.maximumWidth: (captionStyle == Ubuntu.SummaryCaptionStyle) ? units.gu(6) : parent.width
+    Layout.preferredWidth: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Layout.maximumWidth : 0
+    Layout.minimumHeight: 0
+    Layout.maximumHeight: parent ? parent.height : childrenRect.height
+    Layout.preferredHeight: childrenRect.height
+
+    // handle visibility, do not override visible property!
+    // 'hide' column if title and subtitle is an empty string and
+    // there's no more children added
+    states: State {
+        name: "__q_invisible"
+        when: (title.text === "" && subtitle.text === "") && (captions.children.length == 2)
+        PropertyChanges {
+            target: captions
+            visible: false
+        }
+    }
+
+    Label {
+        id: titleLabel
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        fontSize: (captionStyle == Ubuntu.SummaryCaptionStyle) ? "small" : "medium"
+        horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft
+        visible: text !== ""
+        elide: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.ElideRight : Text.ElideNone
+    }
+    Label {
+        id: subtitleLabel
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        fontSize: "small"
+        horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft
+        visible: text !== ""
+        maximumLineCount: (captionStyle == Ubuntu.TitleCaptionStyle) ? 2 : 1
+        wrapMode: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.Wrap : Text.NoWrap
+        elide: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.ElideRight : Text.ElideNone
+    }
+}
 
=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
--- modules/Ubuntu/Components/CheckBox.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/CheckBox.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype CheckBox
 
=== modified file 'modules/Ubuntu/Components/ComboButton.qml'
--- modules/Ubuntu/Components/ComboButton.qml	2014-08-18 16:02:33 +0000
+++ modules/Ubuntu/Components/ComboButton.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Popups 1.0
 import "mathUtils.js" as MathUtils
 
@@ -41,8 +41,8 @@
     \li If the content height is smaller than the value of \l expandedHeight, the combo
         list will be expanded only to the height of the content.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         ComboButton {
             text: "smaller content"
             Rectangle {
@@ -57,8 +57,8 @@
         GridView or PathView, the content scrolling will be provided by the content
         itself.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         ComboButton {
             text: "long scrolled content"
             Column {
@@ -76,8 +76,8 @@
     \li In case the content is a single Flickable, ListView, GridView or PathView,
         the content will be filling the entire combo list area defined.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0
         ComboButton {
             text: "listview"
@@ -94,8 +94,8 @@
         If the content wants to take the size of the entire combo list, it should
         bind its height to the \l comboListHeight property.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         ComboButton {
             id: combo
             text: "smaller content"
@@ -108,8 +108,8 @@
     \li In case the expansion needs to be the size of the combo list content, the \l
         expandedHeight should be set to -1.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         ComboButton {
             text: "auto-sized content"
             expandedHeight: -1
@@ -134,8 +134,8 @@
     example illustrates a possible implementation.
 
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
 
     ComboButton {
         id: combo
@@ -201,8 +201,8 @@
       \l expandedHeight and \l collapsedHeight values. It is a convenience property
       that can be used to size the combo list content.
       \qml
-      import QtQuick 2.0
-      import Ubuntu.Components 1.1
+      import QtQuick 2.4
+      import Ubuntu.Components 1.2
       import Ubuntu.Components.ListItems 0.1
       ComboButton {
           id: combo
 
=== modified file 'modules/Ubuntu/Components/CrossFadeImage.qdoc'
--- modules/Ubuntu/Components/CrossFadeImage.qdoc	2014-06-30 12:00:10 +0000
+++ modules/Ubuntu/Components/CrossFadeImage.qdoc	2015-03-03 15:01:13 +0000
@@ -4,8 +4,8 @@
    \brief An Image like component which smoothly fades when its source is updated.
 
    \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         CrossFadeImage {
             width: units.gu(100)
 
=== modified file 'modules/Ubuntu/Components/CrossFadeImage10.qml'
--- modules/Ubuntu/Components/CrossFadeImage10.qml	2014-07-01 10:56:08 +0000
+++ modules/Ubuntu/Components/CrossFadeImage10.qml	2015-03-03 15:01:13 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 // FIXME: When a module contains QML, C++ and JavaScript elements exported,
 // we need to use named imports otherwise namespace collision is reported
 // by the QML engine. As workaround, we use Ubuntu named import.
 // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 1.1 as Ubuntu
+import Ubuntu.Components 1.2 as Ubuntu
 
 /*!
   \internal
 
=== modified file 'modules/Ubuntu/Components/CrossFadeImage11.qml'
--- modules/Ubuntu/Components/CrossFadeImage11.qml	2014-07-02 13:51:07 +0000
+++ modules/Ubuntu/Components/CrossFadeImage11.qml	2015-03-03 15:01:13 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 // FIXME: When a module contains QML, C++ and JavaScript elements exported,
 // we need to use named imports otherwise namespace collision is reported
 // by the QML engine. As workaround, we use Ubuntu named import.
 // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 1.1 as Ubuntu
+import Ubuntu.Components 1.2 as Ubuntu
 
 /*!
   \internal
 
=== modified file 'modules/Ubuntu/Components/DraggingArea.qml'
--- modules/Ubuntu/Components/DraggingArea.qml	2013-02-26 10:30:04 +0000
+++ modules/Ubuntu/Components/DraggingArea.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "mathUtils.js" as MathLocal
 
 MouseArea {
 
=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2014-06-25 11:38:23 +0000
+++ modules/Ubuntu/Components/Header.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Header
 
=== modified file 'modules/Ubuntu/Components/Icon10.qml'
--- modules/Ubuntu/Components/Icon10.qml	2014-10-20 12:05:33 +0000
+++ modules/Ubuntu/Components/Icon10.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Item {
     id: icon
 
=== modified file 'modules/Ubuntu/Components/Icon11.qml'
--- modules/Ubuntu/Components/Icon11.qml	2014-07-30 20:20:49 +0000
+++ modules/Ubuntu/Components/Icon11.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Icon10 {
     property url source: name ? "image://theme/%1".arg(name) : ""
 
=== modified file 'modules/Ubuntu/Components/InputHandler.qml'
--- modules/Ubuntu/Components/InputHandler.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/InputHandler.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*
   This component is a unified text selection and scrolling handler for both
 
=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2014-08-07 10:28:01 +0000
+++ modules/Ubuntu/Components/Label.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Label
 
=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Base
@@ -23,6 +23,7 @@
     \ingroup ubuntu-listitems
     \brief Parent class of various list item classes that can have
         an icon and a progression symbol.
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples: See subclasses
 */
 
=== modified file 'modules/Ubuntu/Components/ListItems/Caption.qml'
--- modules/Ubuntu/Components/ListItems/Caption.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/Caption.qml	2015-03-03 15:01:13 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Caption
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item that shows a piece of text.
+    \note \b{The component is deprecated. Use ListItem and Captiopns components instead.}
 
     Examples:
     \qml
 
=== modified file 'modules/Ubuntu/Components/ListItems/Divider.qml'
--- modules/Ubuntu/Components/ListItems/Divider.qml	2014-11-18 11:57:19 +0000
+++ modules/Ubuntu/Components/ListItems/Divider.qml	2015-03-03 15:01:13 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Divider
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Divider to break up list items into groups.
+    \note \b{The component is deprecated.}
 
     Examples: see \l Header
 */
 
=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2015-03-03 15:01:13 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Empty
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item with no contents.
+    \note \b{The component is deprecated. Use ListItem component instead.}
     The Empty class can be used for generic list items containing other
     components such as buttons. It is selectable and can take mouse clicks.
     It will attempt to detect if a thin dividing line at the bottom of the
@@ -34,7 +35,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {
 
=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2014-11-18 11:57:19 +0000
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2015-03-03 15:01:13 +0000
@@ -13,8 +13,8 @@
  * 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 QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Expandable
@@ -35,7 +35,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {
 
=== modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml'
--- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ExpandablesColumn
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         ListItem.ExpandablesColumn {
 
=== modified file 'modules/Ubuntu/Components/ListItems/Header.qml'
--- modules/Ubuntu/Components/ListItems/Header.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/ListItems/Header.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Header
 
=== modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml'
--- modules/Ubuntu/Components/ListItems/IconVisual.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/ListItems/IconVisual.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // internal helper class to create the visuals
 // for the icon.
 
=== modified file 'modules/Ubuntu/Components/ListItems/ImageWithFallback.qml'
--- modules/Ubuntu/Components/ListItems/ImageWithFallback.qml	2012-11-22 20:59:44 +0000
+++ modules/Ubuntu/Components/ListItems/ImageWithFallback.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Image {
     id: image
 
=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-11-18 12:01:58 +0000
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2015-03-03 15:01:13 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "." as ListItem
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ItemSelector
 
=== modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml'
--- modules/Ubuntu/Components/ListItems/LabelVisual.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/ListItems/LabelVisual.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // internal helper class for text inside the list items.
 Label {
 
=== modified file 'modules/Ubuntu/Components/ListItems/MultiValue.qml'
--- modules/Ubuntu/Components/ListItems/MultiValue.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/MultiValue.qml	2015-03-03 15:01:13 +0000
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype MultiValue
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying multiple values.
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples:
     \qml
 
=== modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml'
--- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // Internal helper class for the visuals of
 // the progression symbol.
 
=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 
 /*!
@@ -23,10 +23,11 @@
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item containing a single control
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.SingleControl {
 
=== modified file 'modules/Ubuntu/Components/ListItems/SingleValue.qml'
--- modules/Ubuntu/Components/ListItems/SingleValue.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/SingleValue.qml	2015-03-03 15:01:13 +0000
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype SingleValue
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item displaying a single value
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples:
     \qml
 
=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2014-12-01 13:19:32 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Standard
@@ -25,12 +25,13 @@
         with a label (text), and optionally an icon, a progression arrow,
         and it can have an embedded Item (\l control) that can be used
         for including Buttons, Switches etc. inside the list item.
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     \l {http://design.ubuntu.com/apps/building-blocks/list-items}{See also the Design Guidelines on List Items}.
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Standard {
 
=== modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml'
--- modules/Ubuntu/Components/ListItems/Subtitled.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/Subtitled.qml	2015-03-03 15:01:13 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype MultiValue
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying a second string under the main label.
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples:
     \qml
 
=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ThinDivider
 
=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****
 
=== modified file 'modules/Ubuntu/Components/MainView.qdoc'
--- modules/Ubuntu/Components/MainView.qdoc	2015-02-27 07:55:51 +0000
+++ modules/Ubuntu/Components/MainView.qdoc	2015-03-03 15:01:13 +0000
@@ -25,7 +25,7 @@
     The simplest way to use a MainView is to include a single \l Page object
     inside the MainView:
     \qml
-        import QtQuick 2.3
+        import QtQuick 2.4
         import Ubuntu.Components 1.2
 
         MainView {
@@ -55,7 +55,7 @@
     If the \l Page inside the MainView includes a Flickable with enough contents for scrolling,
     the header will automatically hide and show when the user scrolls up or down:
     \qml
-        import QtQuick 2.3
+        import QtQuick 2.4
         import Ubuntu.Components 1.2
 
         MainView {
@@ -126,7 +126,7 @@
   For example, in order for the MainView to draw a color gradient beneath
   the content:
   \qml
-      import QtQuick 2.3
+      import QtQuick 2.4
       import Ubuntu.Components 1.2
 
       MainView {
 
=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2015-02-24 18:51:47 +0000
+++ modules/Ubuntu/Components/MainView.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1 as Toolkit
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
 import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.0
 
 
=== modified file 'modules/Ubuntu/Components/MainView12.qml'
--- modules/Ubuntu/Components/MainView12.qml	2015-02-27 07:55:51 +0000
+++ modules/Ubuntu/Components/MainView12.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.2 as Toolkit
 import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.2
 
=== modified file 'modules/Ubuntu/Components/MainViewBase.qml'
--- modules/Ubuntu/Components/MainViewBase.qml	2015-02-12 11:19:57 +0000
+++ modules/Ubuntu/Components/MainViewBase.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1 as Toolkit
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
 import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.0
 
 
=== modified file 'modules/Ubuntu/Components/Object.qml'
--- modules/Ubuntu/Components/Object.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Object.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Object
 
=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
--- modules/Ubuntu/Components/OptionSelector.qml	2014-11-18 12:01:58 +0000
+++ modules/Ubuntu/Components/OptionSelector.qml	2015-03-03 15:01:13 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "ListItems" as ListItem
-import Ubuntu.Components 1.1 as Toolkit
+import Ubuntu.Components 1.2 as Toolkit
 
 /*!
     \qmltype OptionSelector
@@ -27,7 +27,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         Column {
             spacing: units.gu(3)
 
 
=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
--- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-11-18 12:01:58 +0000
+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2015-03-03 15:01:13 +0000
@@ -22,7 +22,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         Column {
             width: 250
             OptionSelector {
@@ -41,9 +41,9 @@
     \endqml
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "ListItems" as ListItem
-import Ubuntu.Components 1.1 as Toolkit
+import Ubuntu.Components 1.2 as Toolkit
 
 ListItem.Empty {
     id: option
 
=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2015-02-11 10:27:52 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2015-03-03 15:01:13 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype OrientationHelper
 
=== modified file 'modules/Ubuntu/Components/Page.qdoc'
--- modules/Ubuntu/Components/Page.qdoc	2015-02-25 20:04:21 +0000
+++ modules/Ubuntu/Components/Page.qdoc	2015-03-03 15:01:13 +0000
@@ -28,8 +28,8 @@
     and \l head properties of the page:
 
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(48)
@@ -92,8 +92,8 @@
     is automatically set to the first child of the page that is Flickable
     and anchors to the top of the page or fills the page. For example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(30)
 
=== modified file 'modules/Ubuntu/Components/Page10.qml'
--- modules/Ubuntu/Components/Page10.qml	2015-02-27 07:55:51 +0000
+++ modules/Ubuntu/Components/Page10.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1 as Toolkit
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
 
 /*!
   \internal
 
=== modified file 'modules/Ubuntu/Components/Page11.qml'
--- modules/Ubuntu/Components/Page11.qml	2015-02-09 16:04:02 +0000
+++ modules/Ubuntu/Components/Page11.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*! \internal */
 // Documentation in Page.qdoc
 
=== modified file 'modules/Ubuntu/Components/PageHeadConfiguration.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration.qml	2015-02-10 14:16:01 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype PageHeadConfiguration
@@ -121,7 +121,7 @@
 
       Example:
       \qml
-        import QtQuick 2.3
+        import QtQuick 2.4
         import Ubuntu.Components 1.2
 
         MainView {
 
=== modified file 'modules/Ubuntu/Components/PageHeadSections.qml'
--- modules/Ubuntu/Components/PageHeadSections.qml	2015-02-10 14:16:01 +0000
+++ modules/Ubuntu/Components/PageHeadSections.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*!
     \qmltype PageHeadSections
@@ -40,7 +40,7 @@
       List of strings that represent section names. Example:
       \qml
         import Ubuntu.Components 1.2
-        import QtQuick 2.3
+        import QtQuick 2.4
 
         MainView {
             width: units.gu(50)
 
=== modified file 'modules/Ubuntu/Components/PageHeadState.qml'
--- modules/Ubuntu/Components/PageHeadState.qml	2015-02-10 14:16:01 +0000
+++ modules/Ubuntu/Components/PageHeadState.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1 // for Action
+import QtQuick 2.4
+import Ubuntu.Components 1.2 // for Action
 
 /*!
     \qmltype PageHeadState
@@ -28,7 +28,7 @@
    This example shows how to add an action to the header that
    enables the user to enter search/input mode:
    \qml
-        import QtQuick 2.2
+        import QtQuick 2.4
         import Ubuntu.Components 1.2
 
         MainView {
 
=== modified file 'modules/Ubuntu/Components/PageStack.qml'
--- modules/Ubuntu/Components/PageStack.qml	2015-02-27 07:55:51 +0000
+++ modules/Ubuntu/Components/PageStack.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import "stack.js" as Stack
 
 /*!
@@ -36,8 +36,8 @@
     left/right/top/bottom anchors, explicitly set anchors.fill of the PageStack to
     undefined:
     \qml
-        import QtQuick 2.2
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(40)
@@ -75,8 +75,8 @@
 
     Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
 
=== modified file 'modules/Ubuntu/Components/PageTreeNode.qml'
--- modules/Ubuntu/Components/PageTreeNode.qml	2015-02-24 18:51:47 +0000
+++ modules/Ubuntu/Components/PageTreeNode.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \internal
 
=== modified file 'modules/Ubuntu/Components/PageWrapper.qml'
--- modules/Ubuntu/Components/PageWrapper.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/PageWrapper.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "PageWrapperUtils.js" as Utils
 
 /*!
 
=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2014-07-17 13:58:56 +0000
+++ modules/Ubuntu/Components/Panel.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Toolkit
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
 
 /*!
     \qmltype Panel
@@ -37,8 +37,8 @@
 
     A black panel that can be swiped in from the lower-right of the window can be created like this:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         Item {
             width: units.gu(80)
@@ -68,8 +68,8 @@
 
     A panel that looks like the standard (bottom-aligned) toolbar, but with custom contents, can be created like this:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         Item {
             width: units.gu(80)
@@ -105,8 +105,8 @@
     start swiping on the buttons in the examples above in order to hide the panel. To remedy this, clicked()
     signals are forwarded from the panel by calling the child's trigger() function. Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         Rectangle {
             color: Theme.palette.normal.background
 
=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-10-08 09:09:29 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype DatePicker
@@ -35,8 +35,8 @@
     only through the \l date property.
 
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -55,8 +55,8 @@
     \b Minutes and \b Seconds strings sepatared with '|' character. A DatePicker
     which shows only year and month date units would look as follows:
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -74,8 +74,8 @@
     is needed, the model should be set to contain the time specific mode flags.
     The following example demonstrates how to use DatePicker for time picking.
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -111,8 +111,8 @@
                 hours picker presenting 24 hours.
     \endlist
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Column {
 
=== modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml'
--- modules/Ubuntu/Components/Pickers/DayModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/DayModel.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     circular: true
 
=== modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml'
--- modules/Ubuntu/Components/Pickers/Dialer.qml	2014-08-21 05:24:14 +0000
+++ modules/Ubuntu/Components/Pickers/Dialer.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Dialer
@@ -34,7 +34,7 @@
     value between 0 and 50.
 
     \qml
-    import QtQuick 2.0
+    import QtQuick 2.4
     import Ubuntu.Components.Pickers 1.0
 
     Dialer {
 
=== modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml'
--- modules/Ubuntu/Components/Pickers/DialerHand.qml	2014-08-21 05:24:14 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHand.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype DialerHand
 
=== modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml'
--- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2015-03-03 15:01:13 +0000
@@ -13,8 +13,8 @@
  * 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 QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
   \internal
 
=== modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml'
--- modules/Ubuntu/Components/Pickers/HoursModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/HoursModel.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     property int from
 
=== modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml'
--- modules/Ubuntu/Components/Pickers/MinutesModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/MinutesModel.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     property int from
 
=== modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml'
--- modules/Ubuntu/Components/Pickers/MonthModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/MonthModel.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     circular: (count >= 11)
 
=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
--- modules/Ubuntu/Components/Pickers/Picker.qml	2014-09-02 05:52:32 +0000
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Picker
@@ -34,8 +34,8 @@
 
     Example:
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Picker {
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml'
--- modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype PickerDelegate
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerModelBase.qml'
--- modules/Ubuntu/Components/Pickers/PickerModelBase.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/PickerModelBase.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*
   Base model type for DatePicker
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-09-03 08:17:24 +0000
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-03-03 15:01:13 +0000
@@ -15,9 +15,9 @@
  */
 
 pragma Singleton
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Popups 1.0
 
@@ -32,8 +32,8 @@
     area or in a Popover, depending on the form factor, following the design guides
     on date pickers.
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
 
     MainWindow {
         width: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
--- modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-05-07 10:42:31 +0000
+++ modules/Ubuntu/Components/Pickers/PickerRow.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Row {
     id: row
 
=== modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml'
--- modules/Ubuntu/Components/Pickers/SecondsModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/SecondsModel.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     property int from
 
=== modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml'
--- modules/Ubuntu/Components/Pickers/YearModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/YearModel.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     // local properties
 
=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2014-11-21 19:15:17 +0000
+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 
 /*!
 
=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-11-18 11:59:47 +0000
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 /*!
     \qmltype ComposerSheet
     \inherits SheetBase
@@ -32,7 +32,7 @@
 
     Example:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.Popups 1.0
 
         Item {
 
=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-11-18 11:59:47 +0000
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype DefaultSheet
@@ -33,7 +33,7 @@
 
     Example:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.Popups 1.0
 
         Item {
 
=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "internalPopupUtils.js" as InternalPopupUtils
 
 /*!
@@ -32,8 +32,8 @@
 
     Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.Popups 1.0
 
         Item {
 
=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2015-02-26 15:31:15 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2015-03-03 15:01:13 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "internalPopupUtils.js" as InternalPopupUtils
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Popover
@@ -31,8 +31,8 @@
 
     Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
         import Ubuntu.Components.Popups 1.0
 
 
=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2015-01-29 15:46:10 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype PopupBase
 
=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2014-11-18 11:59:47 +0000
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype SheetBase
 
=== modified file 'modules/Ubuntu/Components/ProgressBar10.qml'
--- modules/Ubuntu/Components/ProgressBar10.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/ProgressBar10.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ProgressBar
 
=== modified file 'modules/Ubuntu/Components/ProgressBar11.qml'
--- modules/Ubuntu/Components/ProgressBar11.qml	2014-06-23 12:52:52 +0000
+++ modules/Ubuntu/Components/ProgressBar11.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 ProgressBar {
     property bool showProgressPercentage: true
 
=== modified file 'modules/Ubuntu/Components/PullToRefresh.qml'
--- modules/Ubuntu/Components/PullToRefresh.qml	2014-06-27 06:18:48 +0000
+++ modules/Ubuntu/Components/PullToRefresh.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype PullToRefresh
@@ -32,9 +32,9 @@
     component by defining the completion clause to the \l refreshing property.
 
     \qml
-    import QtQuick 2.2
+    import QtQuick 2.4
     import QtQuick.XmlListModel 2.0
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.ListItems 1.0
 
     MainView {
@@ -82,9 +82,9 @@
     to be shown by the component. Custom implementations can hold any component,
     which will be anchor filled to the component itself.
     \qml
-    import QtQuick 2.2
+    import QtQuick 2.4
     import QtQuick.XmlListModel 2.0
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.ListItems 1.0
 
     MainView {
@@ -130,9 +130,9 @@
     \note When declared as child of Flickable, set parent to the flickable explicitly
     so the component does not land in the \c content of Flickable.
     \qml
-    import QtQuick 2.2
+    import QtQuick 2.4
     import QtQuick.XmlListModel 2.0
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.ListItems 1.0
 
     MainView {
 
=== modified file 'modules/Ubuntu/Components/Scrollbar.qml'
--- modules/Ubuntu/Components/Scrollbar.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/Scrollbar.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ScrollBar
 
=== modified file 'modules/Ubuntu/Components/Slider.qml'
--- modules/Ubuntu/Components/Slider.qml	2014-11-18 12:02:55 +0000
+++ modules/Ubuntu/Components/Slider.qml	2015-03-03 15:01:13 +0000
@@ -16,7 +16,7 @@
 
 // FIXME(loicm) Add support for keyboard shortcuts (basically left/right).
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "mathUtils.js" as MathUtils
 
 /*!
 
=== modified file 'modules/Ubuntu/Components/StyledItem.qml'
--- modules/Ubuntu/Components/StyledItem.qml	2014-08-25 05:56:28 +0000
+++ modules/Ubuntu/Components/StyledItem.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmlabstract StyledItem
 
=== modified file 'modules/Ubuntu/Components/Styles/ComboButtonStyle.qml'
--- modules/Ubuntu/Components/Styles/ComboButtonStyle.qml	2014-10-21 17:48:12 +0000
+++ modules/Ubuntu/Components/Styles/ComboButtonStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ComboButtonStyle
 
=== modified file 'modules/Ubuntu/Components/Styles/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Styles/PageHeadStyle.qml	2014-11-04 10:55:58 +0000
+++ modules/Ubuntu/Components/Styles/PageHeadStyle.qml	2015-03-03 15:01:13 +0000
@@ -13,7 +13,7 @@
  * 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 QtQuick 2.4
 
 /*!
     \qmltype PageHeadStyle
 
=== modified file 'modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml'
--- modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml	2014-10-21 17:48:12 +0000
+++ modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*!
     \qmltype PullToRefreshStyle
 
=== modified file 'modules/Ubuntu/Components/Switch.qml'
--- modules/Ubuntu/Components/Switch.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/Switch.qml	2015-03-03 15:01:13 +0000
@@ -17,7 +17,7 @@
 // FIXME(loicm) It would be nice to have a draggable thumb to toggle the switch,
 //     that needs to be validated with designers though.
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Switch
 
=== modified file 'modules/Ubuntu/Components/Tab.qml'
--- modules/Ubuntu/Components/Tab.qml	2015-02-27 07:55:51 +0000
+++ modules/Ubuntu/Components/Tab.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Tab
@@ -49,7 +49,7 @@
       \l Page can control the height and prevent overlapping the header.
       Example:
       \qml
-        import QtQuick 2.3
+        import QtQuick 2.4
         import Ubuntu.Components 1.2
         MainView {
             width: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/TabBar.qml'
--- modules/Ubuntu/Components/TabBar.qml	2014-08-21 05:24:14 +0000
+++ modules/Ubuntu/Components/TabBar.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype TabBar
 
=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Tabs
@@ -32,8 +32,8 @@
 
     Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
@@ -103,8 +103,8 @@
     \l PageStack, and pushing other pages on top of that, as is shown in the following example:
 
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             id: mainView
 
=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-12-03 15:46:20 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Ubuntu
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 import "mathUtils.js" as MathUtils
 
 
=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2014-11-26 09:57:47 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Ubuntu
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 
 Ubuntu.StyledItem {
 
=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-12-03 15:46:20 +0000
+++ modules/Ubuntu/Components/TextField.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Ubuntu
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 
 /*!
@@ -526,8 +526,8 @@
       between 11 and 31 into the text input:
 
       \qml
-      import QtQuick 2.0
-      import Ubuntu.Components 1.1
+      import QtQuick 2.4
+      import Ubuntu.Components 1.2
       TextField{
           validator: IntValidator{bottom: 11; top: 31;}
           focus: true
 
=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-11-12 03:51:45 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 
 Popover {
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2015-01-15 19:29:11 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Image {
     id: container
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-11-03 19:41:08 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: bubbleShape
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2015-03-03 15:01:13 +0000
@@ -16,8 +16,8 @@
  * Author: Florian Boucault <[e-mail]>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: buttonForeground
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-08-26 14:12:52 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2015-03-03 15:01:13 +0000
@@ -16,8 +16,8 @@
  * Author: Florian Boucault <[e-mail]>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: buttonStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-11-07 15:45:22 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: checkBoxStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	2014-04-29 06:27:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Styles 1.1 as Style
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Styles 1.2 as Style
 
 Style.ComboButtonStyle {
     id: comboStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 
 Item {
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     // style API
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import QtGraphicalEffects 1.0
 
 // FIXME: Replace this once UbuntuShape support for gradients and shading has landed
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2014-07-25 12:55:27 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: dialogForegroundStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml	2014-10-24 15:56:22 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml	2015-03-03 15:01:13 +0000
@@ -13,7 +13,7 @@
  * 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.2
+import QtQuick 2.4
 
 Item {
     id: dividerStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-04-25 05:28:37 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2015-03-03 15:01:13 +0000
@@ -13,8 +13,8 @@
  * 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 QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: headerStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml	2013-12-04 10:49:19 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 ShaderEffect {
     id: magnifier
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2014-08-26 14:12:52 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  *
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: ambianceStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-02-27 14:20:28 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components.Styles 1.2 as Styles
 import Ubuntu.Components 1.2
 
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-12-04 07:18:58 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2015-03-03 15:01:13 +0000
@@ -13,8 +13,8 @@
  * 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 QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     // styling properties
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2014-08-26 14:12:52 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  *
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: ambianceStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml	2014-07-16 11:16:44 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Popups 1.0
 
 Popover {
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2014-10-01 21:09:53 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 AbstractButton {
     id: button
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2015-01-13 15:52:29 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2015-03-03 15:01:13 +0000
@@ -13,11 +13,11 @@
  * 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.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Styles 1.1 as Style
+import Ubuntu.Components.Styles 1.2 as Style
 
 Style.PageHeadStyle {
     id: headerStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Palette.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/Palette.qml	2014-12-03 15:46:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/Palette.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Themes 0.1
 
 Palette {
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PartialColorize.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PartialColorize.qml	2014-01-08 16:32:38 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PartialColorize.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 ShaderEffect {
     id: partialColorize
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PartialColorizeUbuntuShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PartialColorizeUbuntuShape.qml	2014-01-08 16:32:38 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PartialColorizeUbuntuShape.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 PartialColorize {
     fragmentShader: "
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     property real minFade: 0.2
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 
 Item {
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml	2014-07-16 06:31:50 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 BubbleShape {
     property alias contentItem: content
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2015-02-27 13:47:29 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: progressBarStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: progressionVisualStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml	2014-06-26 15:59:10 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Styles 1.1 as Style
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Styles 1.2 as Style
 
 Style.PullToRefreshStyle {
     id: style
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2014-05-26 09:08:27 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*
   The visuals handle both active and passive modes. This behavior is driven yet by
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 EditorCursorStyle {
     id: cursor
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml	2014-09-02 13:17:59 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: visuals
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2014-10-23 19:57:31 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*
   The default slider style consists of a bar and a thumb shape.
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2014-11-06 21:04:13 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: switchStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-05-15 11:36:07 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: tabBarStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2014-12-03 15:46:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // frame
 // FIXME: stabilize API
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-11-12 03:51:45 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // FIXME : move the API into Ubuntu.Components.Style
 Item {
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml	2014-04-30 07:10:06 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 TextAreaStyle {
     objectName: "textfield_style"
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2014-08-11 12:44:43 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: visuals
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2015-03-03 15:01:13 +0000
@@ -13,8 +13,8 @@
  * 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 QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: visuals
 
=== modified file 'modules/Ubuntu/Components/Themes/Palette.qml'
--- modules/Ubuntu/Components/Themes/Palette.qml	2013-07-05 00:02:08 +0000
+++ modules/Ubuntu/Components/Themes/Palette.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Palette
 
=== modified file 'modules/Ubuntu/Components/Themes/PaletteValues.qml'
--- modules/Ubuntu/Components/Themes/PaletteValues.qml	2014-07-11 15:11:02 +0000
+++ modules/Ubuntu/Components/Themes/PaletteValues.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype PaletteValues
 
=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml	2013-07-05 14:34:00 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 MainViewStyle {
 
=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml	2013-08-28 10:43:46 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml	2015-03-03 15:01:13 +0000
@@ -15,7 +15,7 @@
  *
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 OptionSelectorStyle {
 
=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/Palette.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/Palette.qml	2014-08-25 07:35:49 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/Palette.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Themes 0.1
 
 Palette {
 
=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/TabBarStyle.qml	2013-10-11 12:25:47 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/TabBarStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Themes.Ambiance 0.1 as Ambiance
 
 Ambiance.TabBarStyle {
 
=== modified file 'modules/Ubuntu/Components/Themes/SuruGradient/MainViewStyle.qml'
--- modules/Ubuntu/Components/Themes/SuruGradient/MainViewStyle.qml	2013-07-10 19:25:32 +0000
+++ modules/Ubuntu/Components/Themes/SuruGradient/MainViewStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 MainViewStyle {
 
=== modified file 'modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml	2014-08-26 14:12:52 +0000
+++ modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml	2015-03-03 15:01:13 +0000
@@ -15,7 +15,7 @@
  *
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 OptionSelectorStyle {
 
=== modified file 'modules/Ubuntu/Components/Themes/SuruGradient/Palette.qml'
--- modules/Ubuntu/Components/Themes/SuruGradient/Palette.qml	2014-08-25 07:35:49 +0000
+++ modules/Ubuntu/Components/Themes/SuruGradient/Palette.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Themes 0.1
 
 Palette {
 
=== modified file 'modules/Ubuntu/Components/Themes/SuruGradient/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/SuruGradient/TabBarStyle.qml	2013-10-11 12:25:47 +0000
+++ modules/Ubuntu/Components/Themes/SuruGradient/TabBarStyle.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Themes.Ambiance 0.1 as Ambiance
 
 Ambiance.TabBarStyle {
 
=== modified file 'modules/Ubuntu/Components/Toolbar.qml'
--- modules/Ubuntu/Components/Toolbar.qml	2014-11-18 12:02:55 +0000
+++ modules/Ubuntu/Components/Toolbar.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \internal
 
=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
--- modules/Ubuntu/Components/ToolbarButton.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/ToolbarButton.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ToolbarButton
@@ -27,8 +27,8 @@
 
         Example of different ways to define the toolbar button:
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(50)
 
=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml	2014-11-13 15:33:22 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ToolbarItems
@@ -40,8 +40,8 @@
     It is recommended to use \l ToolbarButton inside the ToolbarItems to define the buttons that will
     be visible to the user:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(50)
@@ -72,8 +72,8 @@
     ToolbarButtons and other Items (for example standard Buttons). ToolbarButtons automatically span
     the full height of the toolbar, and other Items you will probably want to center vertically:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(50)
@@ -121,8 +121,8 @@
       The following example shows how to have a classic cancel button that is always
       visible in the toolbar, instead of the default toolbar-styled back button:
         \qml
-            import QtQuick 2.0
-            import Ubuntu.Components 1.1
+            import QtQuick 2.4
+            import Ubuntu.Components 1.2
 
             MainView {
                 width: units.gu(50)
 
=== modified file 'modules/Ubuntu/Components/UbuntuListView.qml'
--- modules/Ubuntu/Components/UbuntuListView.qml	2015-02-25 14:14:05 +0000
+++ modules/Ubuntu/Components/UbuntuListView.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Toolkit
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
 
 /*!
     \qmltype UbuntuListView
@@ -30,7 +30,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {
 
=== modified file 'modules/Ubuntu/Components/UbuntuListView11.qdoc'
--- modules/Ubuntu/Components/UbuntuListView11.qdoc	2014-09-16 15:37:56 +0000
+++ modules/Ubuntu/Components/UbuntuListView11.qdoc	2015-03-03 15:01:13 +0000
@@ -7,8 +7,8 @@
   by default.
 
   \qml
-  import QtQuick 2.2
-  import Ubuntu.Components 1.1
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
   import Ubuntu.Components.ListItems 1.0
 
   UbuntuListView {
 
=== modified file 'modules/Ubuntu/Components/UbuntuListView11.qml'
--- modules/Ubuntu/Components/UbuntuListView11.qml	2014-09-16 15:37:56 +0000
+++ modules/Ubuntu/Components/UbuntuListView11.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 // documentation in UbuntuListView11.qdoc
 UbuntuListView {
 
=== modified file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml'
--- modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2014-09-08 19:47:11 +0000
+++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2015-03-03 15:01:13 +0000
@@ -15,8 +15,8 @@
  *
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype UbuntuNumberAnimation
@@ -28,8 +28,8 @@
     Example of use:
 
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
 
     Rectangle {
         width: 100; height: 100
 
=== modified file 'modules/Ubuntu/Components/plugin/i18n.cpp'
--- modules/Ubuntu/Components/plugin/i18n.cpp	2015-02-03 18:11:32 +0000
+++ modules/Ubuntu/Components/plugin/i18n.cpp	2015-03-03 15:01:13 +0000
@@ -39,7 +39,7 @@
  * It is based on \l {https://www.gnu.org/software/gettext/} {gettext}, and thus the standard gettext tools can be used for translating
  * a project. Example:
  * \qml
- * import QtQuick 2.0
+ * import QtQuick 2.4
  * import Ubunut.Components 0.1
  *
  * Item {
@@ -220,7 +220,7 @@
  * to take the original string and pass it to dtr (or dgettext).
  *
  * \qml
- * import QtQuick 2.0
+ * import QtQuick 2.4
  * import UserMetrics 0.1
  *
  * Metric {
 
=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-06-18 15:24:42 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2015-03-03 15:01:13 +0000
@@ -32,8 +32,8 @@
 
   Popup.qml
   \qml
-  import QtQuick 2.0
-  import Ubuntu.Components 1.1
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
 
   Rectangle {
       anchors.centerIn: parent
@@ -52,8 +52,8 @@
   closing and destroying the popup.
 
   \qml
-  import QtQuick 2.0
-  import Ubuntu.Components 1.1
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
 
   Item {
       width: 640
@@ -76,8 +76,8 @@
   however altered to a different area by setting the \l sensingArea property to
   a component which is either a parent of the mouse area or a sibling of it.
   \qml
-  import QtQuick 2.0
-  import Ubuntu.Components 1.1
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
 
   Item {
       width: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2015-02-27 13:47:29 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-03-03 15:01:13 +0000
@@ -57,6 +57,7 @@
 #include "uclistitemactions.h"
 #include "uclistitemstyle.h"
 #include "ucserviceproperties.h"
+#include "ucnamespace.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -95,6 +96,14 @@
     return uriHandler;
 }
 
+static QObject *registerUbuntuNamespace(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    return new UCNamespace();
+}
+
 void UbuntuComponentsPlugin::registerWindowContextProperty()
 {
     setWindowContextProperty(QGuiApplication::focusWindow());
@@ -176,6 +185,7 @@
     qmlRegisterUncreatableType<UCDragEvent>(uri, 1, 2, "ListItemDrag", "This is an event object");
     qmlRegisterType<UCListItemActions>(uri, 1, 2, "ListItemActions");
     qmlRegisterUncreatableType<UCViewItemsAttached>(uri, 1, 2, "ViewItems", "Not instantiable");
+    qmlRegisterSingletonType<UCNamespace>(uri, 1, 2, "Ubuntu", registerUbuntuNamespace);
     qmlRegisterType<UCUbuntuShape, 1>(uri, 1, 2, "UbuntuShape");
 }
 
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2015-02-27 13:47:29 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2015-03-03 15:01:13 +0000
@@ -77,7 +77,8 @@
     ucserviceproperties.h \
     ucserviceproperties_p.h \
     privates/listitemdragarea.h \
-    privates/listitemdraghandler.h
+    privates/listitemdraghandler.h \
+    ucnamespace.h
 
 SOURCES += plugin.cpp \
     uctheme.cpp \
@@ -122,7 +123,8 @@
     ucviewitemsattached.cpp \
     ucserviceproperties.cpp \
     privates/listitemdragarea.cpp \
-    privates/listitemdraghandler.cpp
+    privates/listitemdraghandler.cpp \
+    ucnamespace.cpp
 
 # adapters
 SOURCES += adapters/alarmsadapter_organizer.cpp
 
=== modified file 'modules/Ubuntu/Components/plugin/sortfiltermodel.cpp'
--- modules/Ubuntu/Components/plugin/sortfiltermodel.cpp	2014-11-28 12:40:09 +0000
+++ modules/Ubuntu/Components/plugin/sortfiltermodel.cpp	2015-03-03 15:01:13 +0000
@@ -35,8 +35,8 @@
  *
  * Example usage:
  * \qml
- * import QtQuick 2.0
- * import Ubuntu.Components 1.1
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.2
  * import Ubuntu.Components.ListItems 1.1
  *
  * MainView {
 
=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp'
--- modules/Ubuntu/Components/plugin/ucalarm.cpp	2015-02-26 15:09:23 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm.cpp	2015-03-03 15:01:13 +0000
@@ -224,8 +224,8 @@
  *
  * Example usage:
  * \qml
- * import QtQuick 2.0
- * import Ubuntu.Components 1.1
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.2
  *
  * Rectangle {
  *     width: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.cpp'
--- modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2015-02-26 15:09:23 +0000
+++ modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2015-03-03 15:01:13 +0000
@@ -39,8 +39,8 @@
  *
  * Example usage:
  * \qml
- * import QtQuick 2.0
- * import Ubuntu.Components 1.1
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.2
  * import Ubuntu.Components.ListItems 1.0
  * ListView {
  *     model: AlarmModel {}
 
=== modified file 'modules/Ubuntu/Components/plugin/ucfontutils.cpp'
--- modules/Ubuntu/Components/plugin/ucfontutils.cpp	2014-07-21 13:43:02 +0000
+++ modules/Ubuntu/Components/plugin/ucfontutils.cpp	2015-03-03 15:01:13 +0000
@@ -33,8 +33,8 @@
  * Example of a Label implementation which uses the default base scale for the font
  * size:
  * \qml
- * import QtQuick 2.0
- * import Ubuntu.Components 1.1
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.2
  *
  * Text {
  *     property string fontSize: "medium"
@@ -45,8 +45,8 @@
  * Another example of a custom text input component exposing a fontSize property and a base
  * font unit size to scale its font:
  * \qml
- * import QtQuick 2.0
- * import Ubuntu.Components 1.1
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.2
  *
  * TextInput {
  *     property string fontSize: "small"
 
=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-02-25 16:07:56 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-03-03 15:01:13 +0000
@@ -618,7 +618,7 @@
  * \qmltype ListItem
  * \instantiates UCListItem
  * \inqmlmodule Ubuntu.Components 1.2
- * \ingroup unstable-ubuntu-listitems
+ * \ingroup ubuntu-listitem
  * \since Ubuntu.Components 1.2
  * \brief The ListItem element provides Ubuntu design standards for list or grid
  * views.
 
=== modified file 'modules/Ubuntu/Components/plugin/uclistitemactions.cpp'
--- modules/Ubuntu/Components/plugin/uclistitemactions.cpp	2015-02-12 07:31:08 +0000
+++ modules/Ubuntu/Components/plugin/uclistitemactions.cpp	2015-03-03 15:01:13 +0000
@@ -40,7 +40,7 @@
  * \inherits QtQObject
  * \inqmlmodule Ubuntu.Components 1.2
  * \since Ubuntu.Components 1.2
- * \ingroup unstable-ubuntu-listitems
+ * \ingroup ubuntu-listitem
  * \brief Provides configuration for actions to be added to a ListItem.
  *
  * ListItem accepts actions that can be configured to appear when swiped to left
@@ -62,7 +62,7 @@
  * The examples below illustrate the worst and best practice when used in a ListView.
  * The worst case:
  * \qml
- * import QtQuick 2.2
+ * import QtQuick 2.4
  * import Ubuntu.Components 1.2
  * MainView {
  *     width: units.gu(40)
@@ -99,7 +99,7 @@
  *
  * This example can be optimized by sharing the action arrays between the items:
  * \qml
- * import QtQuick 2.2
+ * import QtQuick 2.4
  * import Ubuntu.Components 1.2
  * MainView {
  *     width: units.gu(40)
@@ -177,7 +177,7 @@
  * be specified which will be clamped between height and the maximum width of the
  * list item divided by the number of actions in the list.
  * \qml
- * import QtQuick 2.2
+ * import QtQuick 2.4
  * import Ubuntu.Components 1.2
  *
  * MainView {
 
=== modified file 'modules/Ubuntu/Components/plugin/ucmousefilters.cpp'
--- modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-11-12 03:51:45 +0000
+++ modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2015-03-03 15:01:13 +0000
@@ -71,7 +71,7 @@
    MouseArea will no longer receive other mouse events.
 
    \qml
-   import QtQuick 2.0
+   import QtQuick 2.4
 
    TextInput {
        width: 100
@@ -96,8 +96,8 @@
    The previous code sample using Mouse filter, which will print the pressed and
    released mouse buttons would look as follows:
    \qml
-   import QtQuick 2.0
-   import Ubuntu.Components 1.1
+   import QtQuick 2.4
+   import Ubuntu.Components 1.2
 
    TextInput {
        width: 100
@@ -118,8 +118,8 @@
 
    Example of handling right button clicks over a TextInput:
    \qml
-   import QtQuick 2.0
-   import Ubuntu.Components 1.1
+   import QtQuick 2.4
+   import Ubuntu.Components 1.2
 
    TextInput {
        width: 100
@@ -140,8 +140,8 @@
    add new functionality to the primitive.
 
    \qml
-   import QtQuick 2.0
-   import Ubuntu.Components 1.1
+   import QtQuick 2.4
+   import Ubuntu.Components 1.2
 
    TextInput {
        width: 100
@@ -200,8 +200,8 @@
    to the items in the list. In the following example the mouse press in red rectangle
    will be printed as well as the proxied mouse press from the main item.
    \qml
-   import QtQuick 2.0
-   import Ubuntu.Components 1.1
+   import QtQuick 2.4
+   import Ubuntu.Components 1.2
 
    Item {
        id: main
@@ -253,8 +253,8 @@
    is only valid to press and release events, double-click or mouse position change
    will be blocked by the MouseArea still.
    \qml
-   import QtQuick 2.0
-   import Ubuntu.Components 1.1
+   import QtQuick 2.4
+   import Ubuntu.Components 1.2
 
    MouseArea {
        id: topArea
@@ -288,8 +288,8 @@
    can be controlled through the \l priority property. In the following example
    we make sure the TextInput always receives the events before the filter:
    \qml
-   import QtQuick 2.0
-   import Ubuntu.Components 1.1
+   import QtQuick 2.4
+   import Ubuntu.Components 1.2
 
    TextInput {
        id: input
@@ -315,8 +315,8 @@
    are emitted during a mouse move.
 
    \qml
-   import QtQuick 2.0
-   import Ubuntu.Components 1.1
+   import QtQuick 2.4
+   import Ubuntu.Components 1.2
 
    TextInput {
        width: units.gu(40)
 
=== added file 'modules/Ubuntu/Components/plugin/ucnamespace.cpp'
--- modules/Ubuntu/Components/plugin/ucnamespace.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucnamespace.cpp	2015-03-03 15:01:13 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ucnamespace.h"
+
+/*!
+ * \qmltype Ubuntu
+ * \instantiates UCNamespace
+ * \inqmlmodule Ubuntu.Components 1.2
+ * \ingroup ubuntu
+ * \since Ubuntu.Components 1.2
+ * \brief Provides global object with different enums.
+ *
+ * \section2 Enums
+ *
+ * \section4 CaptionStyle enum
+ * The enumeration configures the Captions component style.
+ * \table
+ *  \header
+ *      \li Enum
+ *      \li Description
+ *  \row
+ *      \li TitleCaptionStyle
+ *      \li The Captions labels are configured to represent caption behavior.
+ *  \row
+ *      \li SummaryCaptionStyle
+ *      \li The Captions labels are configured to represent a summary-like description.
+ * \endtable
+ */
+UCNamespace::UCNamespace(QObject *parent) :
+    QObject(parent)
+{
+}
+
 
=== added file 'modules/Ubuntu/Components/plugin/ucnamespace.h'
--- modules/Ubuntu/Components/plugin/ucnamespace.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucnamespace.h	2015-03-03 15:01:13 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef UCNAMESPACE_H
+#define UCNAMESPACE_H
+
+#include <QObject>
+
+class UCNamespace : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(CaptionsStyle)
+public:
+    enum CaptionsStyle {
+        TitleCaptionStyle = 5000,
+        SummaryCaptionStyle
+    };
+    explicit UCNamespace(QObject *parent = 0);
+
+};
+
+#endif // UCNAMESPACE_H
 
=== modified file 'modules/Ubuntu/Components/plugin/ucserviceproperties.cpp'
--- modules/Ubuntu/Components/plugin/ucserviceproperties.cpp	2015-02-19 10:00:07 +0000
+++ modules/Ubuntu/Components/plugin/ucserviceproperties.cpp	2015-03-03 15:01:13 +0000
@@ -97,8 +97,8 @@
  * those. When enumerating properties, each property will be checked twice, with
  * the case specified as well as with the first letter capitalized.
  * \qml
- * import QtQuick 2.3
- * import Ubuntu.Components 1.1
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.2
  *
  * ServiceProperties {
  *     service: "org.freenode.AccountsService"
 
=== modified file 'modules/Ubuntu/Components/plugin/ucstatesaver.cpp'
--- modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2014-09-03 16:12:24 +0000
+++ modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2015-03-03 15:01:13 +0000
@@ -160,8 +160,8 @@
  *
  * Example:
  * \qml
- * import QtQuick 2.0
- * import Ubuntu.Components 1.1
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.2
  *
  * TextField {
  *     id: input
 
=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2014-12-09 07:27:07 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-03-03 15:01:13 +0000
@@ -115,8 +115,8 @@
  * In the following example the TextField will stay focused when clicked on the
  * red rectangle.
  * \qml
- * import QtQuick 2.2
- * import Ubuntu.Components 1.1
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.2
  *
  * Column {
  *     width: units.gu(50)
 
=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2014-12-04 07:18:58 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2015-03-03 15:01:13 +0000
@@ -50,8 +50,8 @@
     Example changing the current theme:
 
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
 
     Item {
         Button {
@@ -63,8 +63,8 @@
     Example creating a style component:
 
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
 
     StyledItem {
         id: myItem
 
=== modified file 'modules/Ubuntu/Components/plugin/ucunits.cpp'
--- modules/Ubuntu/Components/plugin/ucunits.cpp	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/plugin/ucunits.cpp	2015-03-03 15:01:13 +0000
@@ -51,8 +51,8 @@
     Example usage:
 
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
 
     Item {
         width: units.gu(2)
 
=== modified file 'modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp'
--- modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-02-27 07:17:37 +0000
+++ modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-03-03 15:01:13 +0000
@@ -33,7 +33,7 @@
 /*!
  * \qmltype ListItemDrag
  * \inqmlmodule Ubuntu.Components 1.2
- * \ingroup unstable-ubuntu-listitems
+ * \ingroup ubuntu-listitem
  * \since Ubuntu.Components 1.2
  * \brief Provides information about a ListItem drag event.
  *
@@ -185,7 +185,7 @@
  * \qmltype ViewItems
  * \instantiates UCViewItemsAttached
  * \inqmlmodule Ubuntu.Components 1.2
- * \ingroup unstable-ubuntu-listitems
+ * \ingroup ubuntu-listitem
  * \since Ubuntu.Components 1.2
  * \brief A set of properties attached to the ListItem's parent item or ListView.
  *
 
=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2015-02-18 12:37:47 +0000
+++ modules/Ubuntu/Components/qmldir	2015-03-03 15:01:13 +0000
@@ -110,3 +110,4 @@
 
 #version 1.2
 MainView 1.2 MainView12.qml
+Captions 1.2 Captions.qml
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp'
--- modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp	2015-03-03 15:01:13 +0000
@@ -34,7 +34,7 @@
  *
  * Example:
  * \qml
- * import QtQuick 2.0
+ * import QtQuick 2.4
  * import Ubuntu.Layouts 0.1
  *
  * Layouts {
 
=== modified file 'modules/Ubuntu/PerformanceMetrics/BarGraph.qml'
--- modules/Ubuntu/PerformanceMetrics/BarGraph.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/PerformanceMetrics/BarGraph.qml	2015-03-03 15:01:13 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics
 
 Item {
 
=== modified file 'modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml'
--- modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml	2015-03-03 15:01:13 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics
 
 /*!
 
=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2015-02-19 13:00:38 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2015-03-03 15:01:13 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype UbuntuTestCase
 
=== modified file 'tests/resources/listitems/ListItemDragging.qml'
--- tests/resources/listitems/ListItemDragging.qml	2015-02-25 16:05:18 +0000
+++ tests/resources/listitems/ListItemDragging.qml	2015-03-03 15:01:13 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.2
+import QtQuick.Layouts 1.1
 import Ubuntu.Components.ListItems 1.0
 import QtQml.Models 2.1
 
@@ -133,19 +134,22 @@
                             actions: contextualActions
                         }
 
-                        Rectangle {
-                            anchors.fill: parent
-                            color: item.dragging ? UbuntuColors.blue : "#69aa69"
-                        }
-                        Column {
-                            anchors.fill: parent
-                            Label {
-                                text: label + " from index #" + index
-                                anchors.left: parent.left
-                            }
-                            Label {
-                                text: "Click to turn LTR<->RTL"
-                                anchors.right: parent.right
+                        RowLayout {
+                            anchors {
+                                fill: parent
+                                margins: units.gu(0.5)
+                                leftMargin: anchors.rightMargin
+                                rightMargin: units.gu(2)
+                            }
+                            Captions {
+                                id: captions
+                                title.text: label
+                                subtitle.text: "from index #" + index
+                            }
+                            Captions {
+                                captionStyle: Ubuntu.Summary
+                                title.text: "LTR"
+                                subtitle.text: "RTL"
                             }
                         }
 
 
=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2015-02-19 11:56:56 +0000
+++ tests/resources/listitems/ListItemTest.qml	2015-03-03 15:01:13 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -14,9 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import Ubuntu.Components.Styles 1.2
+import QtQuick.Layouts 1.1
 
 MainView {
     id: main
@@ -110,13 +111,23 @@
                 units.gridUnit += 2;
             }
             onPressAndHold: print("pressAndHold", objectName)
-            Label {
-                anchors.fill: parent
-                text: units.gridUnit + "PX/unit"
-            }
-            Button {
-                text: "Press me"
-                anchors.centerIn: parent
+            RowLayout {
+                anchors {
+                    fill: parent
+                    margins: units.gu(0.5)
+                    leftMargin: anchors.rightMargin
+                    rightMargin: units.gu(2)
+                }
+                Label {
+                    anchors.fill: parent
+                    text: units.gridUnit + "PX/unit"
+                    Layout.preferredWidth: paintedWidth
+                }
+                Button {
+                    text: "Press me"
+                    anchors.centerIn: parent
+                    onClicked: units.gridUnit -= 2
+                }
             }
 
             leadingActions: ListItemActions {
@@ -184,15 +195,20 @@
                 trailingActions: trailing
                 contentItem.anchors.margins: units.gu(1)
 
-                Label {
-                    anchors.fill: parent
-                    verticalAlignment: Text.AlignVCenter
-                    text: "This is one Label split in two lines.\n" +
-                          "The second line - item #" + modelData
-                }
-                Button {
-                    text: "Pressme..."
-                    anchors.centerIn: parent
+                RowLayout {
+                    anchors {
+                        fill: parent
+                        margins: units.gu(0.5)
+                        leftMargin: anchors.rightMargin
+                        rightMargin: units.gu(2)
+                    }
+                    Captions {
+                        title.text: "This is one Label split in two lines.\n" +
+                              "The second line - item #" + modelData
+                    }
+                    Button {
+                        text: "Pressme..."
+                    }
                 }
 
                 states: State {
@@ -238,6 +254,10 @@
                         trailingActions: ListItemActions {
                             actions: trailingArray
                         }
+                        contentItem.anchors {
+                            leftMargin: units.gu(2)
+                            rightMargin: units.gu(2)
+                        }
 
                         Label {
                             text: modelData + " Flickable item"
 
=== modified file 'tests/unit/tst_performance/ListItemList.qml'
--- tests/unit/tst_performance/ListItemList.qml	2014-09-15 17:33:35 +0000
+++ tests/unit/tst_performance/ListItemList.qml	2015-03-03 15:01:13 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.3
 import Ubuntu.Components 1.2
 
 Column {
 
=== added file 'tests/unit/tst_performance/ListOfCaptions.qml'
--- tests/unit/tst_performance/ListOfCaptions.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/ListOfCaptions.qml	2015-03-03 15:01:13 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.2
+import QtQuick.Layouts 1.1
+
+Column {
+    width: 800
+    height: 600
+    Repeater {
+        id: repeater
+        model: 5000
+        ListItem {
+            RowLayout {
+                anchors.fill: parent
+                Captions {
+                }
+            }
+        }
+    }
+}
 
=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
--- tests/unit/tst_performance/tst_performance.cpp	2015-02-12 07:31:08 +0000
+++ tests/unit/tst_performance/tst_performance.cpp	2015-03-03 15:01:13 +0000
@@ -80,6 +80,7 @@
         QTest::newRow("list with new ListItem") << "ListItemList.qml" << QUrl();
         QTest::newRow("list with new ListItem with actions") << "ListItemWithActionsList.qml" << QUrl();
         QTest::newRow("list with new ListItem with inline actions") << "ListItemWithInlineActionsList.qml" << QUrl();
+        QTest::newRow("list with Captions, preset: caption") << "ListOfCaptions.qml" << QUrl();
         QTest::newRow("list with ListItems.Empty (equivalent to the new ListItem") << "ListItemsEmptyList.qml" << QUrl();
         // disable this test as it takes >20 seconds. Kept still for measurements to be done during development
 //        QTest::newRow("list with ListItems.Base (one icon, one label and one chevron)") << "ListItemsBaseList.qml" << QUrl();
 
=== added file 'tests/unit_x11/tst_components/tst_captions.qml'
--- tests/unit_x11/tst_components/tst_captions.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_captions.qml	2015-03-03 15:01:13 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 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.4
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.2
+import QtQuick.Layouts 1.1
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Column {
+        width: parent.width
+        ListItem {
+            RowLayout {
+                anchors.fill: parent
+                Captions {
+                    id: defaults
+                }
+            }
+        }
+        ListItem {
+            RowLayout {
+                anchors.fill: parent
+                Captions {
+                    id: testCaptions
+                }
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "CaptionsAPI"
+        when: windowShown
+
+        function test_0_defaults() {
+            compare(defaults.captionStyle, Ubuntu.TitleCaptionStyle, "Default preset is 'titles'");
+            compare(defaults.height, 0, "default height is 0");
+            compare(defaults.width, 0, "default width is 0")
+            compare(defaults.spacing, units.gu(0.5), "default spacing failure");
+            compare(defaults.visible, false, "default should be invisible")
+            compare(defaults.Layout.alignment, Qt.AlignVCenter | Qt.AlignLeft, "center vertically and left horizontally by default");
+        }
+
+        function test_captions_data() {
+            return [
+                {tag: "caption, title.fontSize", captionStyle: Ubuntu.TitleCaptionStyle, label: "title", property: "fontSize", value: "medium"},
+                {tag: "caption, title.horizontalAlignment", captionStyle: Ubuntu.TitleCaptionStyle, label: "title", property: "horizontalAlignment", value: Text.AlignLeft},
+                {tag: "caption, title.elide", captionStyle: Ubuntu.TitleCaptionStyle, label: "title", property: "elide", value: Text.ElideRight},
+                {tag: "caption, subtitle.fontSize", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "fontSize", value: "small"},
+                {tag: "caption, subtitle.horizontalAlignment", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "horizontalAlignment", value: Text.AlignLeft},
+                {tag: "caption, subtitle.maximumLineCount", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "maximumLineCount", value: 2},
+                {tag: "caption, subtitle.wrapMode", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "wrapMode", value: Text.Wrap},
+                {tag: "caption, subtitle.elide", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "elide", value: Text.ElideRight},
+
+                {tag: "summary, title.fontSize", captionStyle: Ubuntu.SummaryCaptionStyle, label: "title", property: "fontSize", value: "small"},
+                {tag: "summary, title.horizontalAlignment", captionStyle: Ubuntu.SummaryCaptionStyle, label: "title", property: "horizontalAlignment", value: Text.AlignRight},
+                {tag: "summary, title.elide", captionStyle: Ubuntu.SummaryCaptionStyle, label: "title", property: "elide", value: Text.ElideNone},
+                {tag: "summary, subtitle.fontSize", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "fontSize", value: "small"},
+                {tag: "summary, subtitle.horizontalAlignment", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "horizontalAlignment", value: Text.AlignRight},
+                {tag: "summary, subtitle.maximumLineCount", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "maximumLineCount", value: 1},
+                {tag: "summary, subtitle.wrapMode", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "wrapMode", value: Text.NoWrap},
+                {tag: "summary, subtitle.elide", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "elide", value: Text.ElideNone},
+            ];
+        }
+        function test_captions(data) {
+            testCaptions.captionStyle = data.captionStyle;
+            compare(testCaptions[data.label][data.property], data.value, data.tag + " values differ");
+        }
+    }
+}