Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-05-20 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

OTA12-2016-05-20

OTA12-2016-05-20

[lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-05-20]

1986. By Zoltan Balogh on 2016-05-22

Disable Yakketi tests

1987. By Zoltan Balogh on 2016-05-22

Disable Yakketi tests

1988. By Zoltan Balogh on 2016-05-25

remove upstart

1989. By Zoltan Balogh on 2016-05-26

Sync with trunk

1990. By Zoltan Balogh on 2016-05-27

be selective with upstart deps

=== modified file '.qmake.conf'
--- .qmake.conf	2015-08-13 09:20:05 +0000
+++ .qmake.conf	2016-05-27 06:40:42 +0000
@@ -16,3 +16,10 @@
 exists($$PWD/../qt.pro) {
     CONFIG += build_with_qt
 }
+
+*-g++* {
+    GCC4 = $$system( gcc -dumpversion | grep "^4.[0-9]" )
+    if (isEmpty(GCC4)) {
+        QMAKE_CXXFLAGS += -Wsuggest-override
+    }
+}

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-26 10:39:18 +0000
+++ debian/changelog	2016-05-27 06:40:42 +0000
@@ -1,4 +1,28 @@
+<<<<<<< TREE
 ubuntu-ui-toolkit (1.3.1979+16.04.20160517.4) yakkety; urgency=medium
+=======
+ubuntu-ui-toolkit (1.3.1984+16.04) UNRELEASED; urgency=medium
+
+  [ Christian Dywan ]
+  * Slimmer frame for TextFields: 0.5dp. Fixes LP: #1578190.
+
+  [ Albert Astals Cid ]
+  * Add override
+    The override specifier (since C++11) specifies that a virtual function 
+    overrides another virtual function. In a member function declaration or 
+    definition, override ensures that the function is virtual and is overriding
+    a virtual function from the base class.
+
+  [ Tim Peeters ]
+  * Fix reference error in PullToRefreshStyle. Fixes LP: #1582843
+  * Mark Tab, Tabs, TabBar, PageHeadConfiguration, PageHeadSections, 
+    PageHeadState, ToolbarButton, ToolbarItems as deprecated in the 
+    documentation. Fixes LP: #1566735, LP: #1566741.
+
+ -- Zoltán Balogh <[e-mail]>  Fri, 20 May 2016 20:38:03 +0300
+
+ubuntu-ui-toolkit-gles (1.3.1979+16.04.20160517.4) yakkety; urgency=medium
+>>>>>>> MERGE-SOURCE
 
   * Rebuild for arm64 gles switch.
 

=== modified file 'debian/control'
--- debian/control	2016-04-21 13:10:34 +0000
+++ debian/control	2016-05-27 06:40:42 +0000
@@ -300,7 +300,7 @@
          ubuntu-app-launch-profiler (>= ${source:Version}),
          ubuntu-keyboard-autopilot [amd64 armhf i386],
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
-         upstart,
+         upstart [amd64 armhf arm64 i386 ppc64 ppc64el],
          url-dispatcher-tools,
          ${misc:Depends},
          ${shlibs:Depends},

=== modified file 'debian/rules'
--- debian/rules	2016-04-05 06:28:06 +0000
+++ debian/rules	2016-05-27 06:40:42 +0000
@@ -9,9 +9,11 @@
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_SERIES ?= $(shell lsb_release -c -s)
 
 # Skip tests on the archs they are known to be flaky  with current configuration
 testskip_architectures := powerpc arm64 ppc64el s390x
+testskip_series := yakkety
 
 override_dh_auto_configure:
 	qmake -r
@@ -20,6 +22,7 @@
 	dh $@ --parallel
 
 override_dh_auto_test:
+ifneq ($(DEB_HOST_SERIES),$(findstring $(DEB_HOST_SERIES), $(testskip_series)))
 ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p debian/tmp/home/run
@@ -27,6 +30,7 @@
 	tests/xvfb.sh dh_auto_test || exit $?
 endif
 endif
+endif
 
 override_dh_build:
 	dh_auto_build --parallel

=== modified file 'debian/rules.gles'
--- debian/rules.gles	2016-04-06 20:16:20 +0000
+++ debian/rules.gles	2016-05-27 06:40:42 +0000
@@ -7,6 +7,9 @@
 export QMAKEFEATURES=$(CURDIR)/features
 DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_SERIES ?= $(shell lsb_release -c -s)
+
+testskip_series := yakkety
 
 CONFIGURE_SWITCHES = "-r" \
                      "ROOT_SOURCE_DIR=$(CURDIR)" \
@@ -20,11 +23,13 @@
 	#dh_auto_configure -- $(CONFIGURE_SWITCHES)
 
 override_dh_auto_test:
+ifneq ($(DEB_HOST_SERIES),$(findstring $(DEB_HOST_SERIES), $(testskip_series)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p debian/tmp/home/run
 	chmod +x tests/xvfb.sh
 	tests/xvfb.sh dh_auto_test || exit $?
 endif
+endif
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp

=== modified file 'src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc'
--- src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc	2015-07-29 10:12:07 +0000
+++ src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc	2016-05-27 06:40:42 +0000
@@ -19,6 +19,7 @@
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
+    \deprecated
     \brief Page.head is used to configure the header for a \l Page.
 
     For examples how to use Page.head, see \l Page.

=== modified file 'src/Ubuntu/Components/1.3/PageHeadSections.qml'
--- src/Ubuntu/Components/1.3/PageHeadSections.qml	2015-06-23 00:18:56 +0000
+++ src/Ubuntu/Components/1.3/PageHeadSections.qml	2016-05-27 06:40:42 +0000
@@ -22,6 +22,7 @@
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
+    \deprecated
     \brief PageHeadSections is used to configure the sections for a \l Page.
 
     These sections will be shown in the bottom part of the header. This component does not

=== modified file 'src/Ubuntu/Components/1.3/PageHeadState.qml'
--- src/Ubuntu/Components/1.3/PageHeadState.qml	2015-05-11 12:50:00 +0000
+++ src/Ubuntu/Components/1.3/PageHeadState.qml	2016-05-27 06:40:42 +0000
@@ -22,6 +22,7 @@
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \since Ubuntu.Components 1.1
+    \deprecated
     \brief PageHeadState is a helper component to make it easier to
         configure the page header when changing states.
 

=== modified file 'src/Ubuntu/Components/1.3/Tab.qml'
--- src/Ubuntu/Components/1.3/Tab.qml	2015-12-08 18:34:40 +0000
+++ src/Ubuntu/Components/1.3/Tab.qml	2016-05-27 06:40:42 +0000
@@ -21,6 +21,7 @@
     \qmltype Tab
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
+    \deprecated
     \brief Component to represent a single tab in a \l Tabs environment.
 
     Examples: See \l Tabs.

=== modified file 'src/Ubuntu/Components/1.3/TabBar.qml'
--- src/Ubuntu/Components/1.3/TabBar.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/1.3/TabBar.qml	2016-05-27 06:40:42 +0000
@@ -21,6 +21,7 @@
     \qmltype TabBar
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
+    \deprecated
     \brief Tab bar that will be shown in the header when \l Tabs is active.
         This component does not need to be instantiated by the developer, it is
         automatically created by the \l Tabs.

=== modified file 'src/Ubuntu/Components/1.3/Tabs.qml'
--- src/Ubuntu/Components/1.3/Tabs.qml	2016-05-09 09:14:44 +0000
+++ src/Ubuntu/Components/1.3/Tabs.qml	2016-05-27 06:40:42 +0000
@@ -21,9 +21,11 @@
     \qmltype Tabs
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
+    \deprecated
     \brief The Tabs class provides an environment where multible \l Tab
     children can be added, and the user is presented with a tab
     bar with tab buttons to select different tab pages.
+    This component is DEPRECATED. See http://design.ubuntu.com/apps/patterns/navigation
 
     Tabs must be placed inside a \l MainView so that it will automatically
     have a header that shows the tabs that can be selected, and the toolbar
@@ -147,6 +149,11 @@
     id: tabs
     anchors.fill: parent
 
+    Component.onCompleted: {
+        print("Tabs component is deprecated. " +
+              "See http://design.ubuntu.com/apps/patterns/navigation");
+    }
+
     /*!
       \qmlproperty int selectedTabIndex
       The index of the currently selected tab.

=== modified file 'src/Ubuntu/Components/1.3/ToolbarButton.qml'
--- src/Ubuntu/Components/1.3/ToolbarButton.qml	2016-05-03 11:19:56 +0000
+++ src/Ubuntu/Components/1.3/ToolbarButton.qml	2016-05-27 06:40:42 +0000
@@ -21,6 +21,7 @@
     \qmltype ToolbarButton
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
+    \deprecated
     \brief An \l ActionItem that represents a button in the toolbar.
         ToolbarButtons should be included in \l ToolbarItems to define the tools of a \l Page.
         The behavior and look of the toolbar button can be specified by setting an \l Action for

=== modified file 'src/Ubuntu/Components/1.3/ToolbarItems.qml'
--- src/Ubuntu/Components/1.3/ToolbarItems.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.3/ToolbarItems.qml	2016-05-27 06:40:42 +0000
@@ -24,6 +24,7 @@
     \brief Row of Items to be placed in a toolbar.
 
     \b DEPRECATED: DO NOT USE THIS. USE \b head.actions IN \l Page INSTEAD.
+    \deprecated
 
     Each \l Page has a tools property that can be set to change the tools of toolbar supplied
     by \l MainView when the \l Page is active. Each ToolbarItems consists of a set of

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2016-05-11 21:17:26 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2016-05-27 06:40:42 +0000
@@ -143,7 +143,7 @@
         if (visible) {
             // Make sure the flickable is back inside its bounds when
             //  the Page becomes visible again:
-            view.returnToBounds();
+            control.target.returnToBounds();
         }
     }
 

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2016-01-28 11:54:29 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2016-05-27 06:40:42 +0000
@@ -72,7 +72,8 @@
 
         UbuntuShape {
             anchors.fill: parent
-            anchors.margins: parent.visible ? units.gu(0.2) : 0
+            anchors.margins: parent.visible ? units.dp(0.5) : 0
+            radius: units.gu(1.7)
             backgroundColor: visuals.backgroundColor
             aspect: UbuntuShape.Flat
         }

=== modified file 'src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h'
--- src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2015-03-24 16:51:39 +0000
+++ src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2016-05-27 06:40:42 +0000
@@ -37,28 +37,28 @@
     AlarmDataAdapter(UCAlarm *qq);
     ~AlarmDataAdapter();
 
-    bool enabled() const;
-    bool setEnabled(bool enabled);
-    QDateTime date() const;
-    bool setDate(const QDateTime &date);
-    QString message() const;
-    bool setMessage(const QString &message);
-    UCAlarm::AlarmType type() const;
-    bool setType(UCAlarm::AlarmType type);
-    UCAlarm::DaysOfWeek daysOfWeek() const;
-    bool setDaysOfWeek(UCAlarm::DaysOfWeek days);
-    QUrl sound() const;
-    bool setSound(const QUrl &sound);
-    QVariant cookie() const;
-    UCAlarm::Error checkAlarm();
+    bool enabled() const override;
+    bool setEnabled(bool enabled) override;
+    QDateTime date() const override;
+    bool setDate(const QDateTime &date) override;
+    QString message() const override;
+    bool setMessage(const QString &message) override;
+    UCAlarm::AlarmType type() const override;
+    bool setType(UCAlarm::AlarmType type) override;
+    UCAlarm::DaysOfWeek daysOfWeek() const override;
+    bool setDaysOfWeek(UCAlarm::DaysOfWeek days) override;
+    QUrl sound() const override;
+    bool setSound(const QUrl &sound) override;
+    QVariant cookie() const override;
+    UCAlarm::Error checkAlarm() override;
 
-    void save();
-    void cancel();
-    void reset();
+    void save() override;
+    void cancel() override;
+    void reset() override;
     bool wait(int msec);
-    void completeSave();
-    void completeCancel();
-    void copyAlarmData(const UCAlarm &other);
+    void completeSave() override;
+    void completeCancel() override;
+    void copyAlarmData(const UCAlarm &other) override;
 
 // adaptation specific data
     void adjustDowSettings(UCAlarm::AlarmType type, UCAlarm::DaysOfWeek days);
@@ -179,17 +179,17 @@
     QOrganizerManager *manager;
     QOrganizerCollection collection;
 
-    void init();
-    int alarmCount();
-    UCAlarm *getAlarmAt(int index) const;
-    bool findAlarm(const UCAlarm &alarm, const QVariant &cookie) const;
+    void init() override;
+    int alarmCount() override;
+    UCAlarm *getAlarmAt(int index) const override;
+    bool findAlarm(const UCAlarm &alarm, const QVariant &cookie) const override;
     void adjustAlarmOccurrence(AlarmDataAdapter &alarm);
 
     void loadAlarms();
     void saveAlarms();
 
-    bool verifyChange(UCAlarm *alarm, AlarmManager::Change change, const QVariant &value);
-    UCAlarmPrivate *createAlarmData(UCAlarm *alarm);
+    bool verifyChange(UCAlarm *alarm, AlarmManager::Change change, const QVariant &value) override;
+    UCAlarmPrivate *createAlarmData(UCAlarm *alarm) override;
 
     void insertAlarm(const QOrganizerItemId &id);
     void updateAlarm(const QOrganizerItemId &id);
@@ -197,7 +197,7 @@
 
 private Q_SLOTS:
     void completeFetchAlarms();
-    bool fetchAlarms();
+    bool fetchAlarms() override;
     void alarmOperation(QList<QPair<QOrganizerItemId,QOrganizerManager::Operation> >);
 
 protected:

=== modified file 'src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h'
--- src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h	2014-11-26 15:39:39 +0000
+++ src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h	2016-05-27 06:40:42 +0000
@@ -32,11 +32,11 @@
 public:
     DBusServiceProperties(UCServiceProperties *qq);
 
-    bool init();
-    bool fetchPropertyValues();
-    bool readProperty(const QString &property);
+    bool init() override;
+    bool fetchPropertyValues() override;
+    bool readProperty(const QString &property) override;
     // for testing purposes only!!!
-    bool testProperty(const QString &property, const QVariant &value);
+    bool testProperty(const QString &property, const QVariant &value) override;
 
     QStringList scannedProperties;
     QDBusConnection connection;

=== modified file 'src/Ubuntu/Components/plugin/inversemouseareatype.h'
--- src/Ubuntu/Components/plugin/inversemouseareatype.h	2014-06-18 15:24:42 +0000
+++ src/Ubuntu/Components/plugin/inversemouseareatype.h	2016-05-27 06:40:42 +0000
@@ -29,16 +29,16 @@
     explicit InverseMouseAreaType(QQuickItem *parent = 0);
     ~InverseMouseAreaType();
 
-    Q_INVOKABLE virtual bool contains(const QPointF &point) const;
+    Q_INVOKABLE bool contains(const QPointF &point) const override;
 
 protected:
-    void itemChange(ItemChange, const ItemChangeData &);
-    void componentComplete();
-    bool eventFilter(QObject *, QEvent *);
+    void itemChange(ItemChange, const ItemChangeData &) override;
+    void componentComplete() override;
+    bool eventFilter(QObject *, QEvent *) override;
 
     // override mouse events
-    void mousePressEvent(QMouseEvent *event);
-    void mouseDoubleClickEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseDoubleClickEvent(QMouseEvent *event) override;
 
 
 private: // getter/setter

=== modified file 'src/Ubuntu/Components/plugin/plugin.h'
--- src/Ubuntu/Components/plugin/plugin.h	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/Components/plugin/plugin.h	2016-05-27 06:40:42 +0000
@@ -30,8 +30,8 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri) override;
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
     static const QUrl &pluginUrl()
     {
         return m_baseUrl;

=== modified file 'src/Ubuntu/Components/plugin/privates/appheaderbase.h'
--- src/Ubuntu/Components/plugin/privates/appheaderbase.h	2016-02-01 21:22:01 +0000
+++ src/Ubuntu/Components/plugin/privates/appheaderbase.h	2016-05-27 06:40:42 +0000
@@ -44,8 +44,8 @@
     void themeChanged2();
 
 protected:
-    virtual void show(bool animate);
-    virtual void hide(bool animate);
+    void show(bool animate) override;
+    void hide(bool animate) override;
 
 private:
     bool m_animate:1;

=== modified file 'src/Ubuntu/Components/plugin/privates/frame.cpp'
--- src/Ubuntu/Components/plugin/privates/frame.cpp	2016-01-21 11:46:11 +0000
+++ src/Ubuntu/Components/plugin/privates/frame.cpp	2016-05-27 06:40:42 +0000
@@ -31,10 +31,10 @@
 {
 public:
     FrameShader();
-    virtual char const* const* attributeNames() const;
-    virtual void initialize();
-    virtual void updateState(
-        const RenderState& state, QSGMaterial* newEffect, QSGMaterial* oldEffect);
+    char const* const* attributeNames() const override;
+    void initialize() override;
+    void updateState(
+        const RenderState& state, QSGMaterial* newEffect, QSGMaterial* oldEffect) override;
 
 private:
     int m_matrixId;

=== modified file 'src/Ubuntu/Components/plugin/privates/frame.h'
--- src/Ubuntu/Components/plugin/privates/frame.h	2016-01-21 11:31:06 +0000
+++ src/Ubuntu/Components/plugin/privates/frame.h	2016-05-27 06:40:42 +0000
@@ -27,9 +27,9 @@
 {
 public:
     UCFrameMaterial();
-    virtual QSGMaterialType* type() const;
-    virtual QSGMaterialShader* createShader() const;
-    virtual int compare(const QSGMaterial* other) const;
+    QSGMaterialType* type() const override;
+    QSGMaterialShader* createShader() const override;
+    int compare(const QSGMaterial* other) const override;
 
     quint32 textureId() const { return m_textureId; }
 
@@ -87,7 +87,7 @@
     void colorChanged();
 
 private:
-    virtual QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* data);
+    QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) override;
 
     QRgb m_color;
     float m_thickness;

=== modified file 'src/Ubuntu/Components/plugin/privates/listitemdragarea.h'
--- src/Ubuntu/Components/plugin/privates/listitemdragarea.h	2015-08-31 15:43:14 +0000
+++ src/Ubuntu/Components/plugin/privates/listitemdragarea.h	2016-05-27 06:40:42 +0000
@@ -31,10 +31,10 @@
     void reset();
 
 protected:
-    void timerEvent(QTimerEvent *event);
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
+    void timerEvent(QTimerEvent *event) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
 
 private:
     QBasicTimer scrollTimer;

=== modified file 'src/Ubuntu/Components/plugin/privates/ucpagewrapper.h'
--- src/Ubuntu/Components/plugin/privates/ucpagewrapper.h	2016-02-08 10:25:31 +0000
+++ src/Ubuntu/Components/plugin/privates/ucpagewrapper.h	2016-05-27 06:40:42 +0000
@@ -77,7 +77,7 @@
     Q_INVOKABLE void destroyObject ();
 
     // QQuickItem interface
-    virtual void itemChange(ItemChange change, const ItemChangeData &data) override;
+    void itemChange(ItemChange change, const ItemChangeData &data) override;
 
     //override QQuickItem properties
     void setVisible2(bool visible);

=== modified file 'src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator_p.h'
--- src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator_p.h	2016-02-18 19:18:13 +0000
+++ src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator_p.h	2016-05-27 06:40:42 +0000
@@ -36,7 +36,7 @@
     ~UCPageWrapperIncubator();
 
     // QQmlIncubator interface
-    virtual void statusChanged(Status status) override;
+    void statusChanged(Status status) override;
     Q_INVOKABLE void forceCompletion();
 
     QJSValue onStatusChanged() const;
@@ -44,7 +44,7 @@
 
 protected:
     // QQmlIncubator interface
-    virtual void setInitialState(QObject *target) override;
+    void setInitialState(QObject *target) override;
 
 
 Q_SIGNALS:

=== modified file 'src/Ubuntu/Components/plugin/quickutils.h'
--- src/Ubuntu/Components/plugin/quickutils.h	2016-02-25 19:42:11 +0000
+++ src/Ubuntu/Components/plugin/quickutils.h	2016-05-27 06:40:42 +0000
@@ -77,7 +77,7 @@
     void keyboardAttachedChanged();
 
 protected:
-    bool eventFilter(QObject *, QEvent *);
+    bool eventFilter(QObject *, QEvent *) override;
 
 private:
     explicit QuickUtils(QObject *parent = 0);

=== modified file 'src/Ubuntu/Components/plugin/sortfiltermodel.h'
--- src/Ubuntu/Components/plugin/sortfiltermodel.h	2014-05-22 15:57:23 +0000
+++ src/Ubuntu/Components/plugin/sortfiltermodel.h	2016-05-27 06:40:42 +0000
@@ -40,10 +40,10 @@
     Q_INVOKABLE QVariantMap get(int row);
     QVariant data(int row, int role);
     Q_INVOKABLE int count();
-    virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 
     /* getters */
-    QHash<int, QByteArray> roleNames() const;
+    QHash<int, QByteArray> roleNames() const override;
 
     /* setters */
     void setFilterProperty(const QString& property);

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
--- src/Ubuntu/Components/plugin/ucabstractbutton.h	2016-04-14 22:03:13 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.h	2016-05-27 06:40:42 +0000
@@ -51,11 +51,11 @@
     bool contains(const QPointF &point) const override;
 
 protected:
-    void classBegin();
-    virtual void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry);
-    void keyReleaseEvent(QKeyEvent *key);
-    void touchEvent(QTouchEvent *event);
+    void classBegin() override;
+    void geometryChanged(const QRectF &newGeometry,
+                         const QRectF &oldGeometry) override;
+    void keyReleaseEvent(QKeyEvent *key) override;
+    void touchEvent(QTouchEvent *event) override;
 
 Q_SIGNALS:
     void pressedChanged();

=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
--- src/Ubuntu/Components/plugin/ucaction.h	2015-12-21 17:49:59 +0000
+++ src/Ubuntu/Components/plugin/ucaction.h	2016-05-27 06:40:42 +0000
@@ -153,7 +153,7 @@
     bool isValidType(QVariant::Type valueType);
     void generateName();
     void setMnemonicFromText(const QString &text);
-    bool event(QEvent *event);
+    bool event(QEvent *event) override;
     void onKeyboardAttached();
 };
 QML_DECLARE_TYPE(UCAction)

=== modified file 'src/Ubuntu/Components/plugin/ucactioncontext.h'
--- src/Ubuntu/Components/plugin/ucactioncontext.h	2015-12-25 10:59:23 +0000
+++ src/Ubuntu/Components/plugin/ucactioncontext.h	2016-05-27 06:40:42 +0000
@@ -38,8 +38,8 @@
 
     static UCActionContextAttached *qmlAttachedProperties(QObject *owner);
 
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
     void markActionsPublished(bool mark);
     bool isPopup() const
     {

=== modified file 'src/Ubuntu/Components/plugin/ucactionmanager.h'
--- src/Ubuntu/Components/plugin/ucactionmanager.h	2015-07-09 17:55:03 +0000
+++ src/Ubuntu/Components/plugin/ucactionmanager.h	2016-05-27 06:40:42 +0000
@@ -34,8 +34,8 @@
 public:
     explicit UCActionManager(QObject *parent = 0);
 
-    void classBegin() {}
-    void componentComplete();
+    void classBegin() override {}
+    void componentComplete() override;
 
     QQmlListProperty<UCAction> actions();
     QQmlListProperty<UCActionContext> localContexts();

=== modified file 'src/Ubuntu/Components/plugin/ucalarmmodel.h'
--- src/Ubuntu/Components/plugin/ucalarmmodel.h	2015-06-16 11:34:02 +0000
+++ src/Ubuntu/Components/plugin/ucalarmmodel.h	2016-05-27 06:40:42 +0000
@@ -33,13 +33,13 @@
     explicit UCAlarmModel(QObject *parent = 0);
     ~UCAlarmModel();
 
-    void classBegin();
-    void componentComplete();
-
-    int rowCount(const QModelIndex &parent) const;
-    QVariant data(const QModelIndex &index, int role) const;
-
-    QHash<int, QByteArray> roleNames() const;
+    void classBegin() override;
+    void componentComplete() override;
+
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+
+    QHash<int, QByteArray> roleNames() const override;
 
     // invokables
     Q_INVOKABLE UCAlarm *get(int index);

=== modified file 'src/Ubuntu/Components/plugin/ucarguments.h'
--- src/Ubuntu/Components/plugin/ucarguments.h	2013-10-18 08:56:39 +0000
+++ src/Ubuntu/Components/plugin/ucarguments.h	2016-05-27 06:40:42 +0000
@@ -52,8 +52,8 @@
     Q_INVOKABLE void quitWithError(const QString& errorMessage = QString());
 
     // inherited from QQmlParserStatus
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
     // methods necessary for implementing property QQmlListProperty arguments
     void appendArguments(UCArgument* argument);

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.h'
--- src/Ubuntu/Components/plugin/ucbottomedge.h	2016-02-20 15:11:02 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.h	2016-05-27 06:40:42 +0000
@@ -104,8 +104,8 @@
     static void regions_clear(QQmlListProperty<UCBottomEdgeRegion> *sections);
 
     void initializeComponent();
-    void classBegin();
-    void itemChange(ItemChange change, const ItemChangeData &data);
+    void classBegin() override;
+    void itemChange(ItemChange change, const ItemChangeData &data) override;
     bool eventFilter(QObject *target, QEvent *event) override;
 
     void unlockOperation(bool running);

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge_p.h'
--- src/Ubuntu/Components/plugin/ucbottomedge_p.h	2016-02-20 15:11:02 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge_p.h	2016-05-27 06:40:42 +0000
@@ -70,8 +70,8 @@
     // from UCStyledItemBase
     bool loadStyleItem(bool animated = true) override;
     // from QQuickItemChangeListener
-    void itemChildAdded(QQuickItem *item, QQuickItem *child);
-    void itemChildRemoved(QQuickItem *item, QQuickItem *child);
+    void itemChildAdded(QQuickItem *item, QQuickItem *child) override;
+    void itemChildRemoved(QQuickItem *item, QQuickItem *child) override;
 
     void setCurrentContent();
     void resetCurrentContent(QQuickItem *newItem);

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.h'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.h	2015-12-11 11:04:54 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.h	2016-05-27 06:40:42 +0000
@@ -70,12 +70,12 @@
     void stateChanged();
 protected:
     UCBottomEdgeHint(UCBottomEdgeHintPrivate &&, QQuickItem *parent);
-    void classBegin();
-    void itemChange(ItemChange change, const ItemChangeData &data);
-    void timerEvent(QTimerEvent *event);
-    void keyPressEvent(QKeyEvent *event);
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
+    void classBegin() override;
+    void itemChange(ItemChange change, const ItemChangeData &data) override;
+    void timerEvent(QTimerEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
 
     void handleFlickableActivation();
     void onDraggingChanged(bool dragging);

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgestyle.h'
--- src/Ubuntu/Components/plugin/ucbottomedgestyle.h	2015-11-20 10:32:07 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgestyle.h	2016-05-27 06:40:42 +0000
@@ -45,7 +45,7 @@
     void revealThresholdChanged();
 
 protected:
-    void mousePressEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event) override;
 
 private:
     QQuickItem *m_panel = nullptr;

=== modified file 'src/Ubuntu/Components/plugin/ucheader.h'
--- src/Ubuntu/Components/plugin/ucheader.h	2016-04-05 12:49:22 +0000
+++ src/Ubuntu/Components/plugin/ucheader.h	2016-05-27 06:40:42 +0000
@@ -48,7 +48,7 @@
 protected:
     virtual void show(bool animate);
     virtual void hide(bool animate);
-    virtual void itemChange(ItemChange change, const ItemChangeData &value);
+    void itemChange(ItemChange change, const ItemChangeData &value) override;
 
 private Q_SLOTS:
     void _q_scrolledContents();

=== modified file 'src/Ubuntu/Components/plugin/ucinversemouse.h'
--- src/Ubuntu/Components/plugin/ucinversemouse.h	2014-04-15 12:51:31 +0000
+++ src/Ubuntu/Components/plugin/ucinversemouse.h	2016-05-27 06:40:42 +0000
@@ -28,18 +28,18 @@
 
     static UCInverseMouse *qmlAttachedProperties(QObject *owner);
 
-    virtual void setEnabled(bool enabled);
-    virtual void setPriority(Priority priority);
+    void setEnabled(bool enabled) override;
+    void setPriority(Priority priority) override;
     bool excludeInputArea() const;
     void setExcludeInputArea(bool value);
 
 protected:
     QMouseEvent mapMouseToOwner(QObject *target, QMouseEvent* event);
     QHoverEvent mapHoverToOwner(QObject *target, QHoverEvent *event);
-    virtual bool eventFilter(QObject *, QEvent *);
-    virtual bool mouseEvents(QObject *target, QMouseEvent *event);
-    virtual bool hoverEvents(QObject *target, QHoverEvent *event);
-    virtual bool hasAttachedFilter(QQuickItem *item);
+    bool eventFilter(QObject *, QEvent *) override;
+    bool mouseEvents(QObject *target, QMouseEvent *event) override;
+    bool hoverEvents(QObject *target, QHoverEvent *event) override;
+    bool hasAttachedFilter(QQuickItem *item) override;
     bool pointInOSK(const QPointF &point);
     bool contains(QMouseEvent *mouse);
 };

=== modified file 'src/Ubuntu/Components/plugin/uclabel.h'
--- src/Ubuntu/Components/plugin/uclabel.h	2016-04-26 16:09:35 +0000
+++ src/Ubuntu/Components/plugin/uclabel.h	2016-05-27 06:40:42 +0000
@@ -70,11 +70,11 @@
 
 protected:
     // from QQuickItem
-    void classBegin();
+    void classBegin() override;
 
     // from UCItemExtension
-    void preThemeChanged(){}
-    void postThemeChanged();
+    void preThemeChanged() override{}
+    void postThemeChanged() override;
 
 Q_SIGNALS:
     void textSizeChanged();

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.h'
--- src/Ubuntu/Components/plugin/uclistitem.h	2016-01-16 15:52:56 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.h	2016-05-27 06:40:42 +0000
@@ -76,16 +76,16 @@
 
 protected:
     virtual QObject *attachedViewItems(QObject *object, bool create);
-    void classBegin();
-    void componentComplete();
-    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data);
-    void itemChange(ItemChange change, const ItemChangeData &data);
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-    bool childMouseEventFilter(QQuickItem *child, QEvent *event);
-    bool eventFilter(QObject *, QEvent *);
-    void timerEvent(QTimerEvent *event);
+    void classBegin() override;
+    void componentComplete() override;
+    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override;
+    void itemChange(ItemChange change, const ItemChangeData &data) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
+    bool eventFilter(QObject *, QEvent *) override;
+    void timerEvent(QTimerEvent *event) override;
     void focusInEvent(QFocusEvent *event) override;
     void focusOutEvent(QFocusEvent *event) override;
     void keyPressEvent(QKeyEvent *event) override;
@@ -146,7 +146,7 @@
     void colorToChanged();
 
 protected:
-    QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *data);
+    QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *data) override;
 
 private:
     void updateGradient();
@@ -241,7 +241,7 @@
     void heightChanged();
 
 protected:
-    bool eventFilter(QObject *, QEvent *);
+    bool eventFilter(QObject *, QEvent *) override;
 
 private:
     UCListItem *m_listItem;

=== modified file 'src/Ubuntu/Components/plugin/uclistitem_p.h'
--- src/Ubuntu/Components/plugin/uclistitem_p.h	2016-01-16 15:52:56 +0000
+++ src/Ubuntu/Components/plugin/uclistitem_p.h	2016-05-27 06:40:42 +0000
@@ -109,8 +109,8 @@
     QQmlListProperty<QQuickItem> children();
     bool contentMoving() const;
     void setContentMoving(bool moved);
-    virtual void preStyleChanged();
-    virtual bool loadStyleItem(bool animated = true);
+    void preStyleChanged() override;
+    bool loadStyleItem(bool animated = true) override;
     bool dragging();
     bool dragMode();
     void setDragMode(bool draggable);

=== modified file 'src/Ubuntu/Components/plugin/uclistitemstyle.h'
--- src/Ubuntu/Components/plugin/uclistitemstyle.h	2015-09-04 09:32:31 +0000
+++ src/Ubuntu/Components/plugin/uclistitemstyle.h	2016-05-27 06:40:42 +0000
@@ -96,8 +96,8 @@
     void rebound();
 
 protected:
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
 private:
 

=== modified file 'src/Ubuntu/Components/plugin/ucmainviewbase.h'
--- src/Ubuntu/Components/plugin/ucmainviewbase.h	2016-04-04 04:47:11 +0000
+++ src/Ubuntu/Components/plugin/ucmainviewbase.h	2016-05-27 06:40:42 +0000
@@ -62,8 +62,8 @@
     UCPopupContext* actionContext() const;
 
     // QQmlParserStatus interface
-    virtual void componentComplete() override;
-    virtual void classBegin() override;
+    void componentComplete() override;
+    void classBegin() override;
 
 Q_SIGNALS:
     void applicationNameChanged(QString applicationName);

=== modified file 'src/Ubuntu/Components/plugin/ucmouse.h'
--- src/Ubuntu/Components/plugin/ucmouse.h	2015-12-03 15:43:23 +0000
+++ src/Ubuntu/Components/plugin/ucmouse.h	2016-05-27 06:40:42 +0000
@@ -114,8 +114,8 @@
     void exited(QQuickMouseEvent *event, QQuickItem *host);
 
 protected:
-    virtual bool eventFilter(QObject *, QEvent *);
-    virtual void timerEvent(QTimerEvent *event);
+    bool eventFilter(QObject *, QEvent *) override;
+    void timerEvent(QTimerEvent *event) override;
     virtual bool mouseEvents(QObject *target, QMouseEvent *event);
     virtual bool hoverEvents(QObject *target, QHoverEvent *event);
     virtual bool forwardedEvents(ForwardedEvent *event);

=== modified file 'src/Ubuntu/Components/plugin/ucpagetreenode.h'
--- src/Ubuntu/Components/plugin/ucpagetreenode.h	2016-02-02 16:43:30 +0000
+++ src/Ubuntu/Components/plugin/ucpagetreenode.h	2016-05-27 06:40:42 +0000
@@ -58,7 +58,7 @@
     bool isPageTreeNode() const;
 
     // QQmlParserStatus interface
-    virtual void componentComplete() override;
+    void componentComplete() override;
 
     Q_INVOKABLE void dumpNodeTree ();
 
@@ -78,7 +78,7 @@
     void setActiveLeafNode(QQuickItem* activeLeafNode);
 
     // QQuickItem interface
-    virtual void itemChange(ItemChange change, const ItemChangeData &value) override;
+    void itemChange(ItemChange change, const ItemChangeData &value) override;
 
 private:
     Q_DECLARE_PRIVATE(UCPageTreeNode)

=== modified file 'src/Ubuntu/Components/plugin/ucproportionalshape.h'
--- src/Ubuntu/Components/plugin/ucproportionalshape.h	2016-02-17 19:32:41 +0000
+++ src/Ubuntu/Components/plugin/ucproportionalshape.h	2016-05-27 06:40:42 +0000
@@ -33,7 +33,7 @@
     void _q_updateHeight();
 
 private:
-    void componentComplete();
+    void componentComplete() override;
 
     Q_DISABLE_COPY(UCProportionalShape)
 };

=== modified file 'src/Ubuntu/Components/plugin/ucscalingimageprovider.h'
--- src/Ubuntu/Components/plugin/ucscalingimageprovider.h	2012-10-28 00:57:40 +0000
+++ src/Ubuntu/Components/plugin/ucscalingimageprovider.h	2016-05-27 06:40:42 +0000
@@ -26,7 +26,7 @@
 {
 public:
     explicit UCScalingImageProvider();
-    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
 };
 
 #endif // SCALINGIMAGEPROVIDER_H

=== modified file 'src/Ubuntu/Components/plugin/ucserviceproperties.h'
--- src/Ubuntu/Components/plugin/ucserviceproperties.h	2014-11-26 15:39:39 +0000
+++ src/Ubuntu/Components/plugin/ucserviceproperties.h	2016-05-27 06:40:42 +0000
@@ -50,8 +50,8 @@
 
     explicit UCServiceProperties(QObject *parent = 0);
     ~UCServiceProperties();
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
     ServiceType type() const;
     void setType(ServiceType type);

=== modified file 'src/Ubuntu/Components/plugin/ucslotslayout.h'
--- src/Ubuntu/Components/plugin/ucslotslayout.h	2015-11-10 11:39:51 +0000
+++ src/Ubuntu/Components/plugin/ucslotslayout.h	2016-05-27 06:40:42 +0000
@@ -56,8 +56,8 @@
 
 protected:
     Q_DECLARE_PRIVATE(UCSlotsLayout)
-    void componentComplete();
-    void itemChange(ItemChange change, const ItemChangeData &data);
+    void componentComplete() override;
+    void itemChange(ItemChange change, const ItemChangeData &data) override;
 
 private:
     Q_PRIVATE_SLOT(d_func(), void _q_onGuValueChanged())

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase.h	2016-04-25 10:45:41 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.h	2016-05-27 06:40:42 +0000
@@ -70,16 +70,16 @@
     UCStyledItemBase(UCStyledItemBasePrivate &, QQuickItem *parent);
 
     // from UCThemingExtension interface
-    virtual void preThemeChanged();
-    virtual void postThemeChanged();
+    void preThemeChanged() override;
+    void postThemeChanged() override;
 
-    void classBegin();
-    void componentComplete();
-    void itemChange(ItemChange change, const ItemChangeData &data);
-    void focusInEvent(QFocusEvent *key);
+    void classBegin() override;
+    void componentComplete() override;
+    void itemChange(ItemChange change, const ItemChangeData &data) override;
+    void focusInEvent(QFocusEvent *key) override;
     void setKeyNavigationFocus(bool value);
-    void mousePressEvent(QMouseEvent *event);
-    bool childMouseEventFilter(QQuickItem *child, QEvent *event);
+    void mousePressEvent(QMouseEvent *event) override;
+    bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
 
 private:
     Q_DECLARE_PRIVATE(UCStyledItemBase)

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2016-01-16 10:55:26 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2016-05-27 06:40:42 +0000
@@ -59,7 +59,7 @@
     virtual void completeComponentInitialization();
 
     // from UCImportVersionChecker
-    virtual QString propertyForVersion(quint16 version) const;
+    QString propertyForVersion(quint16 version) const override;
 
 public:
 

=== modified file 'src/Ubuntu/Components/plugin/ucstylehints.h'
--- src/Ubuntu/Components/plugin/ucstylehints.h	2015-06-02 12:37:41 +0000
+++ src/Ubuntu/Components/plugin/ucstylehints.h	2016-05-27 06:40:42 +0000
@@ -45,8 +45,8 @@
     void _q_applyStyleHints();
 
 protected:
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
 private:
     class Expression {
@@ -82,8 +82,8 @@
 public:
     UCStyleHintsParser() : QQmlCustomParser(QQmlCustomParser::AcceptsSignalHandlers) {}
 
-    virtual void verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings);
-    virtual void applyBindings(QObject *obj, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings);
+    void verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings) override;
+    void applyBindings(QObject *obj, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings) override;
 
 private:
     void verifyProperty(const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding);

=== modified file 'src/Ubuntu/Components/plugin/uctheme.h'
--- src/Ubuntu/Components/plugin/uctheme.h	2016-02-25 17:45:27 +0000
+++ src/Ubuntu/Components/plugin/uctheme.h	2016-05-27 06:40:42 +0000
@@ -90,8 +90,8 @@
     void versionChanged();
 
 protected:
-    void classBegin();
-    void componentComplete()
+    void classBegin() override;
+    void componentComplete() override
     {
         m_completed = true;
     }

=== modified file 'src/Ubuntu/Components/plugin/ucthemingextension.cpp'
--- src/Ubuntu/Components/plugin/ucthemingextension.cpp	2016-01-12 13:48:53 +0000
+++ src/Ubuntu/Components/plugin/ucthemingextension.cpp	2016-05-27 06:40:42 +0000
@@ -75,7 +75,7 @@
     QQuickItem *m_item;
     QQuickItem *m_prevParent;
 
-    void itemParentChanged(QQuickItem *item, QQuickItem *newParent);
+    void itemParentChanged(QQuickItem *item, QQuickItem *newParent) override;
 
 private:
 

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.h'
--- src/Ubuntu/Components/plugin/ucubuntushape.h	2015-12-10 06:25:58 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.h	2016-05-27 06:40:42 +0000
@@ -31,10 +31,10 @@
 {
 public:
     ShapeShader();
-    virtual char const* const* attributeNames() const;
-    virtual void initialize();
-    virtual void updateState(
-        const RenderState& state, QSGMaterial* newEffect, QSGMaterial* oldEffect);
+    char const* const* attributeNames() const override;
+    void initialize() override;
+    void updateState(
+        const RenderState& state, QSGMaterial* newEffect, QSGMaterial* oldEffect) override;
     bool useDistanceFields() const { return m_useDistanceFields; }
 
 private:
@@ -73,9 +73,9 @@
     };
 
     ShapeMaterial();
-    virtual QSGMaterialType* type() const;
-    virtual QSGMaterialShader* createShader() const;
-    virtual int compare(const QSGMaterial* other) const;
+    QSGMaterialType* type() const override;
+    QSGMaterialShader* createShader() const override;
+    int compare(const QSGMaterial* other) const override;
     virtual void updateTextures();
     const Data* constData() const { return &m_data; }
     Data* data() { return &m_data; }
@@ -110,7 +110,7 @@
     ShapeNode();
     ShapeMaterial* material() { return &m_material; }
     QSGGeometry* geometry() { return &m_geometry; }
-    void preprocess() { m_material.updateTextures(); }
+    void preprocess() override { m_material.updateTextures(); }
 
 private:
     ShapeMaterial m_material;
@@ -286,10 +286,10 @@
     void verticalAlignmentChanged();
 
 protected:
-    virtual QString propertyForVersion(quint16 version) const;
-    virtual void componentComplete();
-    virtual QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* data);
-    virtual void geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry);
+    QString propertyForVersion(quint16 version) const override;
+    void componentComplete() override;
+    QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) override;
+    void geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry) override;
 
     // Virtual functions for extended shapes.
     virtual QSGNode* createSceneGraphNode() const;

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushapeoverlay.h'
--- src/Ubuntu/Components/plugin/ucubuntushapeoverlay.h	2015-09-10 11:04:16 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushapeoverlay.h	2016-05-27 06:40:42 +0000
@@ -27,7 +27,7 @@
 {
 public:
     ShapeOverlayShader();
-    virtual char const* const* attributeNames() const;
+    char const* const* attributeNames() const override;
 };
 
 // --- Scene graph material ---
@@ -35,8 +35,8 @@
 class ShapeOverlayMaterial : public ShapeMaterial
 {
 public:
-    virtual QSGMaterialType* type() const;
-    virtual QSGMaterialShader* createShader() const;
+    QSGMaterialType* type() const override;
+    QSGMaterialShader* createShader() const override;
 };
 
 // --- Scene graph node ---
@@ -58,7 +58,7 @@
 
     ShapeOverlayNode();
     QSGGeometry* geometry() { return &m_geometry; }
-    void preprocess() { m_material.updateTextures(); }
+    void preprocess() override { m_material.updateTextures(); }
 
 private:
     ShapeOverlayMaterial m_material;
@@ -92,11 +92,11 @@
     void overlayColorChanged();
 
 protected:
-    virtual QSGNode* createSceneGraphNode() const;
-    virtual void updateGeometry(
+    QSGNode* createSceneGraphNode() const override;
+    void updateGeometry(
         QSGNode* node, const QSizeF& itemSize, float radius, float shapeOffset,
         const QVector4D& sourceCoordTransform, const QVector4D& sourceMaskTransform,
-        const quint32 backgroundColor[3]);
+        const quint32 backgroundColor[3]) override;
 
 private:
     quint16 m_overlayX;

=== modified file 'src/Ubuntu/Components/plugin/unitythemeiconprovider.h'
--- src/Ubuntu/Components/plugin/unitythemeiconprovider.h	2016-05-06 08:53:16 +0000
+++ src/Ubuntu/Components/plugin/unitythemeiconprovider.h	2016-05-27 06:40:42 +0000
@@ -25,7 +25,7 @@
 {
 public:
     UnityThemeIconProvider(const QString &themeName = QStringLiteral("suru"));
-    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
 
 private:
     QSharedPointer<class IconTheme> theme;

=== modified file 'src/Ubuntu/Layouts/plugin/propertychanges_p.h'
--- src/Ubuntu/Layouts/plugin/propertychanges_p.h	2016-03-16 17:20:49 +0000
+++ src/Ubuntu/Layouts/plugin/propertychanges_p.h	2016-05-27 06:40:42 +0000
@@ -116,7 +116,7 @@
 public:
     ParentChange(QQuickItem *item, QQuickItem *targetParent, bool topmostChild);
 
-    void apply();
+    void apply() override;
 private:
     QQuickItem *newParent;
     bool topmostChild;
@@ -128,8 +128,8 @@
 public:
     AnchorChange(QQuickItem *item, const QString &anchor, QQuickItem *target, const QString &targetAnchor = QString());
 
-    void apply();
-    void revert();
+    void apply() override;
+    void revert() override;
 private:
     bool active;
 };
@@ -139,11 +139,11 @@
 {
 public:
     ItemStackBackup(QQuickItem *item);
-    void apply() {}
-    void revert();
+    void apply() override {}
+    void revert() override;
 
 protected:
-    virtual void saveState();
+    void saveState() override;
     QQuickItem *target;
     QQuickItem *prevItem;
 private:
@@ -157,10 +157,10 @@
 public:
     AnchorBackup(QQuickItem *item);
 
-    void apply();
-    void revert();
+    void apply() override;
+    void revert() override;
 protected:
-    virtual void saveState();
+    void saveState() override;
 
     enum Anchor{
         Left = 0,

=== modified file 'src/Ubuntu/Layouts/plugin/ullayouts.h'
--- src/Ubuntu/Layouts/plugin/ullayouts.h	2014-05-14 11:24:48 +0000
+++ src/Ubuntu/Layouts/plugin/ullayouts.h	2016-05-27 06:40:42 +0000
@@ -73,8 +73,8 @@
     void currentLayoutChanged();
 
 protected:
-    void componentComplete();
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+    void componentComplete() override;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
 private:
     QQmlListProperty<ULConditionalLayout> layouts();

=== modified file 'src/Ubuntu/Layouts/plugin/ullayouts_p.h'
--- src/Ubuntu/Layouts/plugin/ullayouts_p.h	2014-05-16 08:33:43 +0000
+++ src/Ubuntu/Layouts/plugin/ullayouts_p.h	2016-05-27 06:40:42 +0000
@@ -42,8 +42,8 @@
     static void warning(QObject *item, const QString &message);
 
 protected: // QQmlIncubator stuff
-    void setInitialState(QObject *object);
-    void statusChanged(Status status);
+    void setInitialState(QObject *object) override;
+    void statusChanged(Status status) override;
 
 private:
     ULLayouts *q_ptr;

=== modified file 'src/Ubuntu/Layouts/plugin/ulplugin.h'
--- src/Ubuntu/Layouts/plugin/ulplugin.h	2014-04-20 19:25:12 +0000
+++ src/Ubuntu/Layouts/plugin/ulplugin.h	2016-05-27 06:40:42 +0000
@@ -27,7 +27,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
     
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 private:
     void registerTypeVersions(const char *uri, int major, int minor);
 };

=== modified file 'src/Ubuntu/PerformanceMetrics/plugin/upmcpuusage.h'
--- src/Ubuntu/PerformanceMetrics/plugin/upmcpuusage.h	2014-02-20 12:09:26 +0000
+++ src/Ubuntu/PerformanceMetrics/plugin/upmcpuusage.h	2016-05-27 06:40:42 +0000
@@ -52,7 +52,7 @@
     void samplingIntervalChanged();
 
 protected:
-    void itemChange(ItemChange change, const ItemChangeData & value);
+    void itemChange(ItemChange change, const ItemChangeData & value) override;
 
 private Q_SLOTS:
     void connectToWindow(QQuickWindow* window);

=== modified file 'src/Ubuntu/PerformanceMetrics/plugin/upmplugin.h'
--- src/Ubuntu/PerformanceMetrics/plugin/upmplugin.h	2014-04-20 19:25:12 +0000
+++ src/Ubuntu/PerformanceMetrics/plugin/upmplugin.h	2016-05-27 06:40:42 +0000
@@ -27,8 +27,8 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
     
 public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri) override;
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
 private:
     void registerTypeVersion(const char *uri, int major, int minor);
 };

=== modified file 'src/Ubuntu/PerformanceMetrics/plugin/upmrenderingtimes.h'
--- src/Ubuntu/PerformanceMetrics/plugin/upmrenderingtimes.h	2014-02-11 17:40:02 +0000
+++ src/Ubuntu/PerformanceMetrics/plugin/upmrenderingtimes.h	2016-05-27 06:40:42 +0000
@@ -58,7 +58,7 @@
     void frameRendered(qint64 renderTime);
 
 protected:
-    void itemChange(ItemChange change, const ItemChangeData & value);
+    void itemChange(ItemChange change, const ItemChangeData & value) override;
 
 private Q_SLOTS:
     void connectToWindow(QQuickWindow* window);

=== modified file 'src/Ubuntu/PerformanceMetrics/plugin/upmtexturefromimage.h'
--- src/Ubuntu/PerformanceMetrics/plugin/upmtexturefromimage.h	2014-01-21 18:35:24 +0000
+++ src/Ubuntu/PerformanceMetrics/plugin/upmtexturefromimage.h	2016-05-27 06:40:42 +0000
@@ -29,7 +29,7 @@
 public:
     explicit UPMTextureFromImageTextureProvider();
     virtual ~UPMTextureFromImageTextureProvider();
-    QSGTexture* texture() const;
+    QSGTexture* texture() const override;
     void setTexture(QSGTexture* texture);
 
 private:
@@ -46,9 +46,9 @@
 public:
     explicit UPMTextureFromImage(QQuickItem* parent = 0);
     virtual ~UPMTextureFromImage();
-    bool isTextureProvider() const;
-    QSGTextureProvider* textureProvider() const;
-    QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData);
+    bool isTextureProvider() const override;
+    QSGTextureProvider* textureProvider() const override;
+    QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData) override;
 
     // getter
     QImage image() const;

=== modified file 'src/Ubuntu/Test/plugin/testplugin.h'
--- src/Ubuntu/Test/plugin/testplugin.h	2014-06-18 05:23:46 +0000
+++ src/Ubuntu/Test/plugin/testplugin.h	2016-05-27 06:40:42 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // TESTPLUGIN_H

=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	2016-04-04 10:16:08 +0000
+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	2016-05-27 06:40:42 +0000
@@ -35,7 +35,7 @@
     ~MouseTouchAdaptorPrivate();
 
     virtual void init() {}
-    virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result)
+    bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) override
             { Q_UNUSED(eventType); Q_UNUSED(message); Q_UNUSED(result); return false; }
     bool isEnabled() const;
     virtual void setEnabled(bool enabled);
@@ -55,7 +55,7 @@
 
     void init() Q_DECL_OVERRIDE;
     bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) Q_DECL_OVERRIDE;
-    void setEnabled(bool value);
+    void setEnabled(bool value) override;
 
     bool xi2HandleEvent(xcb_ge_event_t *event);
     bool handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);

=== modified file 'tests/api/Extinct/Animals/plugin/plugin.h'
--- tests/api/Extinct/Animals/plugin/plugin.h	2015-12-02 09:22:28 +0000
+++ tests/api/Extinct/Animals/plugin/plugin.h	2016-05-27 06:40:42 +0000
@@ -26,8 +26,8 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri) override;
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
 };
 
 #endif // EXTINCT_ANIMALS_PLUGIN_H

=== modified file 'tests/unit_x11/tst_components/tabsmodel.h'
--- tests/unit_x11/tst_components/tabsmodel.h	2013-11-26 12:44:39 +0000
+++ tests/unit_x11/tst_components/tabsmodel.h	2016-05-27 06:40:42 +0000
@@ -28,9 +28,9 @@
 
 public:
     TabsModel();
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex&, int) const;
-    QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex&, int) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
     Q_INVOKABLE void append(const QString &title);
     Q_INVOKABLE QVariantMap get(int index);

=== modified file 'tests/unit_x11/tst_components/tst_components.pro'
--- tests/unit_x11/tst_components/tst_components.pro	2015-09-14 11:39:11 +0000
+++ tests/unit_x11/tst_components/tst_components.pro	2016-05-27 06:40:42 +0000
@@ -4,6 +4,8 @@
 
 TARGET = tst_components
 
+CONFIG += c++11
+
 SOURCES += tst_components.cpp tabsmodel.cpp
 HEADERS += tabsmodel.h
 

=== modified file 'tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml'
--- tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml	2016-05-13 10:16:27 +0000
+++ tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml	2016-05-27 06:40:42 +0000
@@ -24,16 +24,16 @@
     height: units.gu(71)
     id: root
     Flickable {
-        id: view
+        id: flickable
         anchors.fill: parent
-        contentHeight: 1.6*view.height
+        contentHeight: 1.6*flickable.height
         Label {
             anchors.centerIn: parent
             text: "void"
         }
         PullToRefresh {
             id: pullToRefresh
-            parent: view
+            parent: flickable
             onRefresh: {
                 refreshing = true;
                 refreshing = false;
@@ -46,13 +46,13 @@
         when: windowShown
 
         function test_reposition_after_refresh_bug1578619() {
-            var initialTopMargin = view.topMargin;
-            var initialContentY = view.contentY;
-            flick(view, view.width/2, units.gu(10), 0, units.gu(40));
-            tryCompare(view, "moving", false);
-            tryCompare(view, "topMargin", initialTopMargin, 500,
+            var initialTopMargin = flickable.topMargin;
+            var initialContentY = flickable.contentY;
+            flick(flickable, flickable.width/2, units.gu(10), 0, units.gu(40));
+            tryCompare(flickable, "moving", false);
+            tryCompare(flickable, "topMargin", initialTopMargin, 500,
                     "Initial topMargin of flickable is not restored after refreshing.");
-            tryCompare(view, "contentY", initialContentY, 500,
+            tryCompare(flickable, "contentY", initialContentY, 500,
                     "Initial contentY of flickable is not restored after refreshing.")
         }
     }