Merge lp:~aacid/unity8/require_qt56 into lp:unity8

[Albert Astals Cid]

Require Qt 5.6 & misc fixes

Require Qt 5.6:
    We align with what we're really testing
    We can use Q_ENUM/Q_FLAG instead of Q_ENUMS/Q_FLAGS (Qt 5.5)

CursorImageInfo.cpp
    Join two QString::arg into one

SessionsModel.cpp
UsersModel.cpp
    Remove useless Q_D

dashconnection.cpp
ColorTheme.cpp
UserMetrics.cpp
horizontaljournaltest.cpp
listviewwithpageheadersectionexternalmodeltest.cpp
organicgridtest.cpp
verticaljournaltest.cpp
    QObjects should have the Q_OBJECT macro

indicatorsmodel.h
fakeindicatorsmodel.h
    There's no Roles enum, remove

appdrawerproxymodel.cpp
MirSurfaceItem.cpp
    Add & to the foreach variable

appdrawerproxymodel.cpp
    Make the string comparison faster

easingcurve.h
    Remove QEasingCurve::Type declaration, it's already in Qt

unitysortfilterproxymodelqml.h
fake_scopesoverview.h
    Make some parent functions accessible to remove clang warnings

PageList.cpp
unitymenumodel.cpp
qinputdeviceinfo_mock.cpp
    Better way to iterate the container

Greeter.cpp
    Cheaper env var checking

mediaplayer.cpp
mediaplayer.h
    Rename timerEvent, clang was not happy since QObject has another one

ApplicationInfo.h
    Mark as override

MockAppDrawerModel.cpp
launchermodeltest.cpp
screens.cpp
    Fix warning

fake_previewwidgetmodel.h
    Forward declare struct the same way it is defined later

fake_scopes.cpp
    Safer connect

horizontaljournaltest.cpp
verticaljournaltest.cpp
testutil.cpp
    Use at instead of [] in temporary

launchermodelastest.cpp
    Remove unused member
    Use toModelIndex() instead of value<QModelIndex>()

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2746
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2784/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3645/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3673
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3518/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3518/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3518/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3518/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3518/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3518/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2784/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/require_qt56]

2747. By Albert Astals Cid on 2016-12-23

Easier way of deleting all but the last item

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2747
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2785/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3647
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2086
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2086
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3675
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3520
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3520/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3520
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3520/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3520
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3520/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3520
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3520/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3520
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3520/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3520
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3520/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2785/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/require_qt56]

2748. By Albert Astals Cid on 2017-01-02

Fix the rwrite to use iterators properly

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2748
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2788/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3650
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2088
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2088
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3678
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3523/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2788/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Code changes look fine to me, it also builds fine with 5.6.1 here.

[Michael Zanetti (mzanetti)]

tested, works.

CI is happy too

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-12 16:45:09 +0000
+++ CMakeLists.txt	2017-01-02 08:48:40 +0000
@@ -62,13 +62,13 @@
                                        ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
 
 include(FindPkgConfig)
-find_package(Qt5Core 5.4 REQUIRED)
-find_package(Qt5Qml 5.4 REQUIRED)
-find_package(Qt5Quick 5.4 REQUIRED)
-find_package(Qt5Gui 5.4 REQUIRED)
-find_package(Qt5DBus 5.4 REQUIRED)
-find_package(Qt5Concurrent 5.4 REQUIRED)
-find_package(Qt5Sql 5.4 REQUIRED)
+find_package(Qt5Core 5.6 REQUIRED)
+find_package(Qt5Qml 5.6 REQUIRED)
+find_package(Qt5Quick 5.6 REQUIRED)
+find_package(Qt5Gui 5.6 REQUIRED)
+find_package(Qt5DBus 5.6 REQUIRED)
+find_package(Qt5Concurrent 5.6 REQUIRED)
+find_package(Qt5Sql 5.6 REQUIRED)
 
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

=== modified file 'debian/control'
--- debian/control	2016-12-12 16:45:09 +0000
+++ debian/control	2017-01-02 08:48:40 +0000
@@ -51,7 +51,7 @@
                qml-module-qt-labs-folderlistmodel,
                qml-module-qt-labs-settings,
                qml-module-qtqml-statemachine,
-               qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),
+               qml-module-qtmultimedia (>= 5.6),
                qml-module-qtquick-layouts,
                qml-module-qtquick-xmllistmodel,
                qml-module-qtquick2,
@@ -60,12 +60,12 @@
                qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
                qml-module-ubuntu-web,
                qt5-default,
-               qtbase5-dev (>= 5.4),
+               qtbase5-dev (>= 5.6),
                qtbase5-dev-tools,
-               qtbase5-private-dev (>= 5.4),
-               qtdeclarative5-dev (>= 5.4),
+               qtbase5-private-dev (>= 5.6),
+               qtdeclarative5-dev (>= 5.6),
                qtdeclarative5-dev-tools,
-               qtdeclarative5-private-dev (>= 5.4),
+               qtdeclarative5-private-dev (>= 5.6),
                qtdeclarative5-ubuntu-content1,
                qtdeclarative5-ubuntu-settings-components (>= 0.11),
                ttf-ubuntu-font-family,

=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2016-08-08 10:10:25 +0000
+++ plugins/AccountsService/AccountsService.h	2017-01-02 08:48:40 +0000
@@ -29,7 +29,6 @@
 class AccountsService: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(PasswordDisplayHint)
     Q_PROPERTY (QString user
                 READ user
                 WRITE setUser
@@ -86,6 +85,7 @@
         Keyboard,
         Numeric,
     };
+    Q_ENUM(PasswordDisplayHint)
 
     explicit AccountsService(QObject *parent = 0, const QString & user = QString());
     ~AccountsService() = default;

=== modified file 'plugins/Cursor/CursorImageInfo.cpp'
--- plugins/Cursor/CursorImageInfo.cpp	2016-07-15 14:36:52 +0000
+++ plugins/Cursor/CursorImageInfo.cpp	2017-01-02 08:48:40 +0000
@@ -108,8 +108,7 @@
 QUrl CursorImageInfo::imageSource() const
 {
     auto urlString = QString("image://cursor/%1/%2/%3")
-        .arg(m_themeName)
-        .arg(m_cursorName)
+        .arg(m_themeName, m_cursorName)
         .arg(m_cursorHeight);
 
     return QUrl(urlString);

=== modified file 'plugins/Dash/abstractdashview.cpp'
--- plugins/Dash/abstractdashview.cpp	2016-07-12 15:05:58 +0000
+++ plugins/Dash/abstractdashview.cpp	2017-01-02 08:48:40 +0000
@@ -23,7 +23,7 @@
  , m_asyncRequestedIndex(-1)
  , m_columnSpacing(0)
  , m_rowSpacing(0)
- , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4
+ , m_buffer(320) // Same value as QML_VIEW_DEFAULTCACHEBUFFER in qquickitemview.cpp (Qt 5.6)
  , m_displayMarginBeginning(0)
  , m_displayMarginEnd(0)
  , m_needsRelayout(false)

=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2016-07-28 15:34:29 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2017-01-02 08:48:40 +0000
@@ -46,18 +46,18 @@
     Q_PROPERTY(QString hostname READ hostname CONSTANT)
     Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
 
-    Q_ENUMS(PromptType MessageType)
-
 public:
     enum PromptType {
         PromptTypeQuestion,
         PromptTypeSecret
     };
+    Q_ENUM(PromptType)
 
     enum MessageType {
         MessageTypeInfo,
         MessageTypeError
     };
+    Q_ENUM(MessageType)
 
     explicit Greeter(QObject* parent=0);
     virtual ~Greeter();

=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-06-15 15:29:34 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2017-01-02 08:48:40 +0000
@@ -38,7 +38,6 @@
     QAbstractListModel(parent),
     d_ptr(new SessionsModelPrivate(this))
 {
-    Q_D(SessionsModel);
     m_roleNames = QAbstractListModel::roleNames();
     m_roleNames[KeyRole] = "key";
     m_roleNames[TypeRole] = "type";

=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2015-11-23 22:45:55 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2017-01-02 08:48:40 +0000
@@ -35,8 +35,6 @@
     {
         Q_OBJECT
 
-        Q_ENUMS(SessionModelRoles SessionType)
-
     public:
 
         enum SessionModelRoles {
@@ -46,11 +44,13 @@
             IdRole = KeyRole, /** Deprecated */
             TypeRole
         };
+        Q_ENUM(SessionModelRoles)
 
         enum SessionType {
             LocalSessions,
             RemoteSessions
         };
+        Q_ENUM(SessionType)
 
         explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
         explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);

=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2016-06-27 14:51:40 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2017-01-02 08:48:40 +0000
@@ -37,8 +37,6 @@
 {
     Q_OBJECT
 
-    Q_ENUMS(UserModelRoles)
-
 public:
     explicit UsersModel(QObject *parent = 0);
     virtual ~UsersModel() = default;
@@ -53,6 +51,7 @@
                          BackgroundPathRole,
                          UidRole
     };
+    Q_ENUM(UserModelRoles)
 
     int rowCount(const QModelIndex &parent) const override;
     QVariant data(const QModelIndex &index, int role) const override;

=== modified file 'plugins/LightDM/SessionsModel.h'
--- plugins/LightDM/SessionsModel.h	2015-11-24 00:25:27 +0000
+++ plugins/LightDM/SessionsModel.h	2017-01-02 08:48:40 +0000
@@ -28,8 +28,6 @@
 {
     Q_OBJECT
 
-    Q_ENUMS(SessionModelRoles)
-
     Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories
             WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)
 Q_SIGNALS:
@@ -45,6 +43,7 @@
         TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,
         IconRole
     };
+    Q_ENUM(SessionModelRoles)
 
     explicit SessionsModel(QObject* parent=nullptr);
 

=== modified file 'plugins/Lights/Lights.h'
--- plugins/Lights/Lights.h	2014-07-02 23:15:54 +0000
+++ plugins/Lights/Lights.h	2017-01-02 08:48:40 +0000
@@ -27,7 +27,6 @@
 class Lights: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(State)
     Q_PROPERTY(State state READ state  WRITE setState NOTIFY stateChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
     Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
@@ -38,6 +37,7 @@
         Off,
         On,
     };
+    Q_ENUM(State)
 
     explicit Lights(QObject *parent = 0);
     ~Lights();

=== modified file 'plugins/Powerd/Powerd.h'
--- plugins/Powerd/Powerd.h	2015-10-05 02:14:13 +0000
+++ plugins/Powerd/Powerd.h	2017-01-02 08:48:40 +0000
@@ -27,8 +27,6 @@
 class Powerd: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(Status)
-    Q_ENUMS(DisplayStateChangeReason)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 
 public:
@@ -41,11 +39,13 @@
         SnapDecision    = 5, // Display changed state due to snap decision prompt
         CallDone        = 6, // Display changed state due to voice call end
     };
+    Q_ENUM(DisplayStateChangeReason)
 
     enum Status {
         Off,
         On,
     };
+    Q_ENUM(Status)
 
     explicit Powerd(QObject *parent = 0);
     ~Powerd();

=== modified file 'plugins/UInput/uinput.h'
--- plugins/UInput/uinput.h	2015-11-25 14:58:55 +0000
+++ plugins/UInput/uinput.h	2017-01-02 08:48:40 +0000
@@ -27,7 +27,6 @@
 class UInput : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(Button)
 
 public:
     enum Button {
@@ -35,6 +34,7 @@
         ButtonRight,
         ButtonMiddle
     };
+    Q_ENUM(Button)
 
     explicit UInput(QObject *parent = nullptr);
     ~UInput();

=== modified file 'plugins/Ubuntu/Gestures/Direction.h'
--- plugins/Ubuntu/Gestures/Direction.h	2015-12-10 10:22:25 +0000
+++ plugins/Ubuntu/Gestures/Direction.h	2017-01-02 08:48:40 +0000
@@ -26,7 +26,6 @@
  */
 class UBUNTUGESTURESQML_EXPORT Direction : public QObject {
     Q_OBJECT
-    Q_ENUMS(Type)
 
 public:
     // Make sure it is kept synchronized with SDK UCSwipeArea::Direction
@@ -38,6 +37,7 @@
         Horizontal, // Along the X axis, in any direction
         Vertical // Along the Y axis, in any direction
     };
+    Q_ENUM(Type)
 
     Q_INVOKABLE static bool isHorizontal(Direction::Type type);
     Q_INVOKABLE static bool isVertical(Direction::Type type);

=== modified file 'plugins/Ubuntu/Gestures/TouchGestureArea.h'
--- plugins/Ubuntu/Gestures/TouchGestureArea.h	2016-08-29 23:35:35 +0000
+++ plugins/Ubuntu/Gestures/TouchGestureArea.h	2017-01-02 08:48:40 +0000
@@ -114,7 +114,6 @@
 class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
 {
     Q_OBJECT
-    Q_ENUMS(Status)
 
     Q_PROPERTY(int status READ status NOTIFY statusChanged)
     Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
@@ -137,6 +136,7 @@
         Recognized,
         Rejected
     };
+    Q_ENUM(Status)
     TouchGestureArea(QQuickItem* parent = nullptr);
     ~TouchGestureArea();
 

=== modified file 'plugins/Unity/DashCommunicator/CMakeLists.txt'
--- plugins/Unity/DashCommunicator/CMakeLists.txt	2014-09-24 17:34:33 +0000
+++ plugins/Unity/DashCommunicator/CMakeLists.txt	2017-01-02 08:48:40 +0000
@@ -1,5 +1,6 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${libunity8-private_SOURCE_DIR}
 )
 

=== modified file 'plugins/Unity/DashCommunicator/dashconnection.cpp'
--- plugins/Unity/DashCommunicator/dashconnection.cpp	2015-09-14 09:11:08 +0000
+++ plugins/Unity/DashCommunicator/dashconnection.cpp	2017-01-02 08:48:40 +0000
@@ -32,6 +32,7 @@
  */
 class AsyncDBusInterface : public QDBusAbstractInterface
 {
+    Q_OBJECT
 public:
     AsyncDBusInterface(const QString &service, const QString &path,
                        const QString &interface, const QDBusConnection &connection,
@@ -61,3 +62,5 @@
         dbusInterface()->asyncCall(QStringLiteral("SetCurrentScope"), index, animate, isSwipe);
     }
 }
+
+#include "dashconnection.moc"

=== modified file 'plugins/Unity/Indicators/indicators.h'
--- plugins/Unity/Indicators/indicators.h	2015-01-20 16:21:07 +0000
+++ plugins/Unity/Indicators/indicators.h	2017-01-02 08:48:40 +0000
@@ -27,13 +27,13 @@
 {
     Q_OBJECT
 public:
-    Q_ENUMS(ActionStates)
     enum ActionStates {
       Label           = 0x00,
       IconSource      = 0x01,
       AccessableName  = 0x02,
       Visible         = 0x03,
     };
+    Q_ENUM(ActionStates)
 
     ActionState(QObject*parent=0):QObject(parent) {}
 };
@@ -42,11 +42,11 @@
 {
     Q_OBJECT
 public:
-    Q_ENUMS(NetworkActionStates)
     enum NetworkActionStates {
       Connection      = 0x01,
       SignalStrength  = 0x02,
     };
+    Q_ENUM(NetworkActionStates)
 
     NetworkActionState(QObject*parent=0):QObject(parent) {}
 };
@@ -55,13 +55,13 @@
 {
     Q_OBJECT
 public:
-    Q_ENUMS(NetworkConnectionStates)
     enum NetworkConnectionStates {
       Initial         = 0x00,
       Activating      = 0x01,
       Activated       = 0x02,
       Deactivating    = 0x03,
     };
+    Q_ENUM(NetworkConnectionStates)
 
     NetworkConnection(QObject*parent=0):QObject(parent) {}
 };
@@ -70,12 +70,12 @@
 {
     Q_OBJECT
 public:
-    Q_ENUMS(Roles)
     enum Roles {
         Identifier = 0,
         Position,
         IndicatorProperties
     };
+    Q_ENUM(Roles)
 
     IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
 };
@@ -84,7 +84,6 @@
 {
     Q_OBJECT
 public:
-    Q_ENUMS(Roles)
     enum Roles {
         Action  = Qt::DisplayRole + 1,
         Label,
@@ -93,6 +92,7 @@
         hasSection,
         hasSubMenu
     };
+    Q_ENUM(Roles)
 
     FlatMenuProxyModelRole(QObject*parent=0):QObject(parent) {}
 };

=== modified file 'plugins/Unity/Indicators/indicatorsmodel.h'
--- plugins/Unity/Indicators/indicatorsmodel.h	2015-11-21 22:41:41 +0000
+++ plugins/Unity/Indicators/indicatorsmodel.h	2017-01-02 08:48:40 +0000
@@ -32,7 +32,6 @@
 class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_ENUMS(Roles)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
 

=== modified file 'plugins/Unity/InputInfo/qinputinfo.h'
--- plugins/Unity/InputInfo/qinputinfo.h	2015-10-02 14:23:01 +0000
+++ plugins/Unity/InputInfo/qinputinfo.h	2017-01-02 08:48:40 +0000
@@ -57,8 +57,6 @@
 class QInputDevice : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(InputType)
-    Q_FLAGS(InputType InputTypeFlags)
     friend class QInputDeviceManagerPrivate;
 
 public:
@@ -72,8 +70,9 @@
         Keyboard = 16,
         Switch = 32
     };
-    Q_ENUMS(InputType)
+    Q_FLAG(InputType)
     Q_DECLARE_FLAGS(InputTypeFlags, InputType)
+    Q_FLAG(InputTypeFlags)
 
     explicit QInputDevice(QObject *parent = 0);
     QString name() const;

=== modified file 'plugins/Utils/appdrawerproxymodel.cpp'
--- plugins/Utils/appdrawerproxymodel.cpp	2016-11-28 13:27:22 +0000
+++ plugins/Utils/appdrawerproxymodel.cpp	2017-01-02 08:48:40 +0000
@@ -157,8 +157,8 @@
         QStringList allWords = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleKeywords).toStringList();
         allWords.prepend(m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString());
         bool found = false;
-        Q_FOREACH (const QString currentWord, allWords) {
-            if (currentWord.toLower().startsWith(m_filterString.toLower())) {
+        Q_FOREACH (const QString &currentWord, allWords) {
+            if (currentWord.startsWith(m_filterString, Qt::CaseInsensitive)) {
                 found = true;
                 break;
             }

=== modified file 'plugins/Utils/appdrawerproxymodel.h'
--- plugins/Utils/appdrawerproxymodel.h	2016-11-28 10:17:22 +0000
+++ plugins/Utils/appdrawerproxymodel.h	2017-01-02 08:48:40 +0000
@@ -23,8 +23,6 @@
 class AppDrawerProxyModel: public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_ENUMS(GroupBy)
-    Q_ENUMS(SortBy)
     Q_PROPERTY(QAbstractItemModel* source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(GroupBy group READ group WRITE setGroup NOTIFY groupChanged)
     Q_PROPERTY(QString filterLetter READ filterLetter WRITE setFilterLetter NOTIFY filterLetterChanged)
@@ -38,10 +36,12 @@
         GroupByAll,
         GroupByAToZ
     };
+    Q_ENUM(GroupBy)
     enum SortBy {
         SortByAToZ,
         SortByUsage
     };
+    Q_ENUM(SortBy)
 
     AppDrawerProxyModel(QObject* parent = nullptr);
 

=== modified file 'plugins/Utils/easingcurve.h'
--- plugins/Utils/easingcurve.h	2015-11-20 15:01:39 +0000
+++ plugins/Utils/easingcurve.h	2017-01-02 08:48:40 +0000
@@ -36,7 +36,6 @@
 class EasingCurve: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(QEasingCurve::Type)
     Q_PROPERTY(QEasingCurve::Type type READ type WRITE setType NOTIFY typeChanged)
     Q_PROPERTY(qreal period READ period WRITE setPeriod NOTIFY periodChanged)
     Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)

=== modified file 'plugins/Utils/unitysortfilterproxymodelqml.h'
--- plugins/Utils/unitysortfilterproxymodelqml.h	2015-04-30 09:31:51 +0000
+++ plugins/Utils/unitysortfilterproxymodelqml.h	2017-01-02 08:48:40 +0000
@@ -38,6 +38,11 @@
     Q_INVOKABLE int mapRowToSource(int row);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 
+    // Make the QSortFilterProxyModel variants also accessible
+    using QSortFilterProxyModel::data;
+    using QSortFilterProxyModel::mapFromSource;
+    using QSortFilterProxyModel::mapToSource;
+
     /* getters */
     int totalCount() const;
     bool invertMatch() const;

=== modified file 'plugins/Utils/windowstatestorage.h'
--- plugins/Utils/windowstatestorage.h	2016-12-01 18:35:18 +0000
+++ plugins/Utils/windowstatestorage.h	2017-01-02 08:48:40 +0000
@@ -25,7 +25,6 @@
 class WindowStateStorage: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(WindowState)
 public:
     enum WindowState {
         WindowStateNormal = 1 << 0,
@@ -42,10 +41,9 @@
         WindowStateMaximizedBottomRight = 1 << 11,
         WindowStateRestored = 1 << 12
     };
+    Q_ENUM(WindowState)
     Q_DECLARE_FLAGS(WindowStates, WindowState)
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
     Q_FLAG(WindowStates)
-#endif
 
     WindowStateStorage(QObject *parent = 0);
     virtual ~WindowStateStorage();

=== modified file 'plugins/Wizard/PageList.cpp'
--- plugins/Wizard/PageList.cpp	2016-07-18 13:33:45 +0000
+++ plugins/Wizard/PageList.cpp	2017-01-02 08:48:40 +0000
@@ -71,11 +71,8 @@
     // If there was a system update installed, skip until the last page to just greet the user
     QSettings settings;
     if (settings.value(QStringLiteral("Wizard/SkipUntilFinishedPage")).toBool()) {
-        const QString lastPage = m_pages.lastKey();
-        Q_FOREACH(const QString &page, m_pages.keys()) {
-            if (Q_UNLIKELY(page != lastPage)) {
-                m_pages.remove(page);
-            }
+        while (m_pages.count() > 1) {
+            m_pages.erase(m_pages.begin());
         }
 
         // ... and reset it again for the next run

=== modified file 'plugins/Wizard/timezonemodel.h'
--- plugins/Wizard/timezonemodel.h	2016-03-02 23:03:06 +0000
+++ plugins/Wizard/timezonemodel.h	2017-01-02 08:48:40 +0000
@@ -27,7 +27,6 @@
     Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
     Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
     Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
-    Q_ENUMS(Roles)
 
 public:
     explicit TimeZoneLocationModel(QObject *parent = nullptr);
@@ -42,6 +41,7 @@
         LatitudeRole,
         LongitudeRole
     };
+    Q_ENUM(Roles)
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

=== modified file 'src/libunity8-private/abstractdbusservicemonitor.h'
--- src/libunity8-private/abstractdbusservicemonitor.h	2014-12-17 13:34:22 +0000
+++ src/libunity8-private/abstractdbusservicemonitor.h	2017-01-02 08:48:40 +0000
@@ -30,7 +30,6 @@
 class Q_DECL_EXPORT AbstractDBusServiceMonitor : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(Bus)
     Q_PROPERTY(bool serviceAvailable READ serviceAvailable NOTIFY serviceAvailableChanged)
 
 public:
@@ -38,6 +37,7 @@
         SessionBus,
         SystemBus,
     };
+    Q_ENUM(Bus)
 
     explicit AbstractDBusServiceMonitor(const QString &service, const QString &path, const QString &interface,
                                         const Bus bus = SessionBus,

=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2016-08-30 13:43:08 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2017-01-02 08:48:40 +0000
@@ -27,7 +27,6 @@
 class AccountsService: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(PasswordDisplayHint)
     Q_PROPERTY (QString user
                 READ user
                 WRITE setUser
@@ -94,6 +93,7 @@
         Keyboard,
         Numeric
     };
+    Q_ENUM(PasswordDisplayHint)
 
     explicit AccountsService(QObject *parent = 0);
 

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-07-28 15:34:29 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2017-01-02 08:48:40 +0000
@@ -173,7 +173,7 @@
 
 void Greeter::sendAuthenticationComplete()
 {
-    if (qgetenv("UNITY_TESTING").isEmpty()) {
+    if (qEnvironmentVariableIsEmpty("UNITY_TESTING")) {
         // simulate PAM's delay
         QTimer::singleShot(1000, this, &Greeter::authenticationComplete);
     } else {

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2016-07-28 15:34:29 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2017-01-02 08:48:40 +0000
@@ -42,8 +42,6 @@
     Q_PROPERTY(QString hostname READ hostname CONSTANT)
     Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
 
-    Q_ENUMS(PromptType MessageType)
-
     //Mock-only API for testing purposes
     Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
 
@@ -52,11 +50,13 @@
         PromptTypeQuestion,
         PromptTypeSecret
     };
+    Q_ENUM(PromptType)
 
     enum MessageType {
         MessageTypeInfo,
         MessageTypeError
     };
+    Q_ENUM(MessageType)
 
     explicit Greeter(QObject* parent=0);
     virtual ~Greeter();

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2017-01-02 08:48:40 +0000
@@ -33,7 +33,6 @@
     QAbstractListModel(parent),
     d_ptr(new SessionsModelPrivate(this))
 {
-    Q_D(SessionsModel);
     m_roleNames = QAbstractListModel::roleNames();
     m_roleNames[KeyRole] = "key";
     m_roleNames[TypeRole] = "type";

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2016-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2017-01-02 08:48:40 +0000
@@ -29,8 +29,6 @@
     {
         Q_OBJECT
 
-        Q_ENUMS(SessionModelRoles SessionType)
-
     public:
 
         enum SessionModelRoles {
@@ -40,11 +38,13 @@
             IdRole = KeyRole, /** Deprecated */
             TypeRole
         };
+        Q_ENUM(SessionModelRoles)
 
         enum SessionType {
             LocalSessions,
             RemoteSessions
         };
+        Q_ENUM(SessionType)
 
         explicit SessionsModel(QObject* parent=nullptr); /** Deprecated. Loads local sessions*/
         explicit SessionsModel(SessionsModel::SessionType, QObject* parent=nullptr);

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-05-24 22:11:21 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp	2017-01-02 08:48:40 +0000
@@ -34,8 +34,6 @@
     QAbstractListModel(parent),
     d_ptr(new UsersModelPrivate(this))
 {
-    Q_D(UsersModel);
-
     // Extend roleNames (we want to keep the "display" role)
     QHash<int, QByteArray> roles = roleNames();
     roles[NameRole] = "name";

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2016-05-24 22:11:21 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2017-01-02 08:48:40 +0000
@@ -31,8 +31,6 @@
 {
     Q_OBJECT
 
-    Q_ENUMS(UserModelRoles)
-
     //Mock-only API for testing purposes
     Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
 
@@ -53,6 +51,7 @@
                          BackgroundPathRole,
                          UidRole
     };
+    Q_ENUM(UserModelRoles)
 
     int rowCount(const QModelIndex &parent) const override;
     QVariant data(const QModelIndex &index, int role) const override;

=== modified file 'tests/mocks/Lights/Lights.h'
--- tests/mocks/Lights/Lights.h	2014-11-11 10:45:41 +0000
+++ tests/mocks/Lights/Lights.h	2017-01-02 08:48:40 +0000
@@ -23,7 +23,6 @@
 class Lights: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(State)
     Q_PROPERTY(State state READ state  WRITE setState NOTIFY stateChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
     Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
@@ -34,6 +33,7 @@
         Off,
         On,
     };
+    Q_ENUM(State)
 
     explicit Lights(QObject *parent = 0);
     ~Lights();

=== modified file 'tests/mocks/Powerd/Powerd.h'
--- tests/mocks/Powerd/Powerd.h	2015-09-02 13:42:24 +0000
+++ tests/mocks/Powerd/Powerd.h	2017-01-02 08:48:40 +0000
@@ -24,8 +24,6 @@
 class Powerd: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(Status)
-    Q_ENUMS(DisplayStateChangeReason)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 
 public:
@@ -35,11 +33,13 @@
         PowerKey        = 2, // Display changed state due to user pressing power key
         Proximity       = 3, // Display changed state due to proximity events
     };
+    Q_ENUM(DisplayStateChangeReason)
 
     enum Status {
         Off,
         On,
     };
+    Q_ENUM(Status)
 
     explicit Powerd(QObject *parent = 0);
 

=== modified file 'tests/mocks/QMenuModel/dbus-enums.h'
--- tests/mocks/QMenuModel/dbus-enums.h	2014-11-14 17:47:00 +0000
+++ tests/mocks/QMenuModel/dbus-enums.h	2017-01-02 08:48:40 +0000
@@ -28,9 +28,6 @@
 {
     Q_OBJECT
 
-    Q_ENUMS(BusType)
-    Q_ENUMS(ConnectionStatus)
-
 public:
     enum BusType {
         None = 0,
@@ -38,12 +35,14 @@
         SystemBus,
         LastBusType
     };
+    Q_ENUM(BusType)
 
     enum ConnectionStatus {
         Disconnected = 0,
         Connecting,
         Connected
     };
+    Q_ENUM(ConnectionStatus)
 
 private:
     DBusEnums() {}

=== modified file 'tests/mocks/QMenuModel/unitymenumodel.cpp'
--- tests/mocks/QMenuModel/unitymenumodel.cpp	2014-10-07 10:28:59 +0000
+++ tests/mocks/QMenuModel/unitymenumodel.cpp	2017-01-02 08:48:40 +0000
@@ -220,9 +220,9 @@
 {
     static QHash<QByteArray, int> roles;
     if (roles.isEmpty()) {
-        QHash<int, QByteArray> names = roleNames();
-        Q_FOREACH (int role, names.keys())
-            roles.insert(names[role], role);
+        const QHash<int, QByteArray> names = roleNames();
+        for(auto it = names.begin(); it != names.end(); ++it)
+            roles.insert(it.value(), it.key());
     }
 
     return this->data(this->index(row, 0), roles[role]);

=== modified file 'tests/mocks/QtMultimedia/mediaplayer.cpp'
--- tests/mocks/QtMultimedia/mediaplayer.cpp	2016-07-27 14:25:44 +0000
+++ tests/mocks/QtMultimedia/mediaplayer.cpp	2017-01-02 08:48:40 +0000
@@ -58,7 +58,7 @@
 {
     qsrand(time(nullptr));
     m_timer.setInterval(100);
-    connect(&m_timer, &QTimer::timeout, this, &MediaPlayer::timerEvent);
+    connect(&m_timer, &QTimer::timeout, this, &MediaPlayer::processTimer);
 
     connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAboutToBeRemoved,
             this, [this](const QUrl& source) {
@@ -188,7 +188,7 @@
     }
 }
 
-void MediaPlayer::timerEvent()
+void MediaPlayer::processTimer()
 {
     if (m_position + m_timer.interval() < duration()) {
         m_position +=  m_timer.interval();

=== modified file 'tests/mocks/QtMultimedia/mediaplayer.h'
--- tests/mocks/QtMultimedia/mediaplayer.h	2016-07-27 14:25:44 +0000
+++ tests/mocks/QtMultimedia/mediaplayer.h	2017-01-02 08:48:40 +0000
@@ -45,17 +45,13 @@
     Q_PROPERTY(QObject *metaData READ metaData CONSTANT)
     Q_PROPERTY(DeclarativePlaylist *playlist READ playlist WRITE setPlaylist NOTIFY playlistChanged)
 
-    Q_ENUMS(PlaybackState)
-    Q_ENUMS(AudioRole)
-    Q_ENUMS(Availability)
-    Q_ENUMS(Status)
-    Q_ENUMS(Error)
 public:
     enum PlaybackState {
         PlayingState,
         PausedState,
         StoppedState
     };
+    Q_ENUM(PlaybackState)
 
     enum AudioRole {
         UnknownRole,
@@ -69,6 +65,7 @@
         SonificationRole,
         GameRole
     };
+    Q_ENUM(AudioRole)
 
     enum Availability {
         Available,
@@ -76,6 +73,7 @@
         Unavailable,
         ResourceMissing
     };
+    Q_ENUM(Availability)
 
     enum Status {
         UnknownStatus,
@@ -88,6 +86,7 @@
         EndOfMedia,
         InvalidMedia
     };
+    Q_ENUM(Status)
 
     enum Error {
         NoError,
@@ -97,6 +96,7 @@
         AccessDeniedError,
         ServiceMissingError
     };
+    Q_ENUM(Error)
 
     explicit MediaPlayer(QObject *parent = nullptr);
 
@@ -145,7 +145,7 @@
     void error(Error error, const QString &errorString);
 
 private Q_SLOTS:
-    void timerEvent();
+    void processTimer();
 
 private:
     QUrl m_source;

=== modified file 'tests/mocks/UInput/mockuinput.h'
--- tests/mocks/UInput/mockuinput.h	2016-01-20 19:21:31 +0000
+++ tests/mocks/UInput/mockuinput.h	2017-01-02 08:48:40 +0000
@@ -27,7 +27,6 @@
 class MockUInput : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(Button)
 
 public:
     enum Button {
@@ -35,6 +34,7 @@
         ButtonRight,
         ButtonMiddle
     };
+    Q_ENUM(Button)
 
     explicit MockUInput(QObject *parent = nullptr);
     ~MockUInput();

=== modified file 'tests/mocks/Ubuntu/Connectivity/networking-status.h'
--- tests/mocks/Ubuntu/Connectivity/networking-status.h	2014-09-01 10:25:28 +0000
+++ tests/mocks/Ubuntu/Connectivity/networking-status.h	2017-01-02 08:48:40 +0000
@@ -26,9 +26,6 @@
     Q_OBJECT
     Q_DISABLE_COPY(NetworkingStatus)
 
-    Q_ENUMS(Limitations)
-    Q_ENUMS(Status)
-
     Q_PROPERTY(QVector<Limitations> limitations READ limitations NOTIFY limitationsChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
@@ -41,12 +38,14 @@
     enum Limitations {
         Bandwith
     };
+    Q_ENUM(Limitations)
 
     enum Status {
         Offline,
         Connecting,
         Online
     };
+    Q_ENUM(Status)
 
     QVector<Limitations> limitations() const;
     Status status() const;

=== modified file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h'
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h	2016-01-07 20:59:28 +0000
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h	2017-01-02 08:48:40 +0000
@@ -22,7 +22,6 @@
 class MockSecurityPrivacy : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(SecurityType)
     Q_PROPERTY (SecurityType securityType
                 READ getSecurityType
                 NOTIFY securityTypeChanged)
@@ -33,6 +32,7 @@
          Passcode,
          Passphrase,
     };
+    Q_ENUM(SecurityType)
 
     MockSecurityPrivacy(QObject *parent = 0);
 

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2016-11-30 19:24:02 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2017-01-02 08:48:40 +0000
@@ -112,7 +112,7 @@
 
     //////
     // internal mock stuff
-    void close();
+    void close() override;
     void requestFocus();
 
 Q_SIGNALS:

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-11-30 19:24:02 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2017-01-02 08:48:40 +0000
@@ -216,7 +216,7 @@
         Q_EMIT touchReleaseCountChanged(m_touchReleaseCount);
     }
 
-    Q_FOREACH(QTouchEvent::TouchPoint touchPoint, event->touchPoints()) {
+    Q_FOREACH(const QTouchEvent::TouchPoint &touchPoint, event->touchPoints()) {
         QString id(touchPoint.id());
         QVariantList list =  m_touchTrail[id].toList();
         list.append(QVariant::fromValue(touchPoint.pos()));

=== modified file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.h'
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2015-04-30 09:31:51 +0000
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2017-01-02 08:48:40 +0000
@@ -25,7 +25,6 @@
 class FakeIndicatorsModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_ENUMS(Roles)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
     Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged)

=== modified file 'tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp'
--- tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp	2016-04-04 07:49:06 +0000
+++ tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp	2017-01-02 08:48:40 +0000
@@ -43,10 +43,14 @@
 
 void QInputDeviceManagerPrivate::removeDevice(const QString &path)
 {
-    Q_FOREACH (const QString devicePath, deviceMap.keys()) {
+    auto it = deviceMap.begin();
+    while (it != deviceMap.end()) {
+        const QString devicePath = it.key();
         if (devicePath.contains(path)) {
-            deviceMap.remove(devicePath);
+            it = deviceMap.erase(it);
             Q_EMIT deviceRemoved(devicePath);
+        } else {
+            ++it;
         }
     }
 }

=== modified file 'tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp'
--- tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2016-11-24 16:17:30 +0000
+++ tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2017-01-02 08:48:40 +0000
@@ -53,7 +53,7 @@
     qsrand(QDateTime::currentMSecsSinceEpoch() / 1000);
 }
 
-int MockAppDrawerModel::rowCount(const QModelIndex &parent) const
+int MockAppDrawerModel::rowCount(const QModelIndex & /*parent*/) const
 {
     return m_list.count();
 }

=== modified file 'tests/mocks/Unity/Notifications/MockActionModel.h'
--- tests/mocks/Unity/Notifications/MockActionModel.h	2015-09-23 11:21:07 +0000
+++ tests/mocks/Unity/Notifications/MockActionModel.h	2017-01-02 08:48:40 +0000
@@ -36,11 +36,11 @@
     QVariant data(const QModelIndex &index, int role) const override;
     QHash<int, QByteArray> roleNames() const override;
 
-    Q_ENUMS(ActionsRoles)
     enum ActionsRoles {
         RoleActionLabel = Qt::UserRole + 1,
         RoleActionId    = Qt::UserRole + 2
     };
+    Q_ENUM(ActionsRoles)
     Q_INVOKABLE QVariant data(int row, int role) const;
 
     Q_INVOKABLE void append(const QString &id, const QString &label);

=== modified file 'tests/mocks/Unity/Notifications/MockNotification.h'
--- tests/mocks/Unity/Notifications/MockNotification.h	2016-08-19 13:41:07 +0000
+++ tests/mocks/Unity/Notifications/MockNotification.h	2017-01-02 08:48:40 +0000
@@ -30,7 +30,6 @@
 
 class MockNotification : public QObject {
     Q_OBJECT
-    Q_ENUMS(Type Urgency)
     Q_PROPERTY(QString summary READ getSummary WRITE setSummary NOTIFY summaryChanged)
     Q_PROPERTY(QString body READ getBody WRITE setBody NOTIFY bodyChanged)
     Q_PROPERTY(int nid READ getID WRITE setID NOTIFY idChanged)
@@ -48,7 +47,9 @@
 
 public:
     enum Urgency { Low, Normal, Critical };
+    Q_ENUM(Urgency)
     enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };
+    Q_ENUM(Type)
 
 Q_SIGNALS:
     void summaryChanged(const QString &summary);

=== modified file 'tests/mocks/Unity/Screens/screens.cpp'
--- tests/mocks/Unity/Screens/screens.cpp	2016-01-20 19:33:38 +0000
+++ tests/mocks/Unity/Screens/screens.cpp	2017-01-02 08:48:40 +0000
@@ -30,7 +30,7 @@
     m_screenList.append(new Screen());
 }
 
-Screens::~Screens()
+Screens::~Screens() noexcept
 {
     qDeleteAll(m_screenList);
     m_screenList.clear();

=== modified file 'tests/mocks/Unity/Screens/screens.h'
--- tests/mocks/Unity/Screens/screens.h	2015-12-03 11:45:52 +0000
+++ tests/mocks/Unity/Screens/screens.h	2017-01-02 08:48:40 +0000
@@ -25,7 +25,6 @@
 class Screens : public QAbstractListModel
 {
     Q_OBJECT
-    Q_ENUMS(OutputTypes)
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
@@ -52,6 +51,7 @@
         TV,
         EDP
     };
+    Q_ENUM(OutputTypes)
 
     explicit Screens(QObject *parent = 0);
     virtual ~Screens() noexcept;

=== modified file 'tests/mocks/Unity/fake_previewwidgetmodel.h'
--- tests/mocks/Unity/fake_previewwidgetmodel.h	2014-05-13 14:05:47 +0000
+++ tests/mocks/Unity/fake_previewwidgetmodel.h	2017-01-02 08:48:40 +0000
@@ -23,7 +23,7 @@
 #include <QSharedPointer>
 #include <QVariantMap>
 
-class PreviewData;
+struct PreviewData;
 
 class PreviewWidgetModel : public unity::shell::scopes::PreviewWidgetModelInterface
 {

=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
--- tests/mocks/Unity/fake_scopes.cpp	2016-06-07 03:33:35 +0000
+++ tests/mocks/Unity/fake_scopes.cpp	2017-01-02 08:48:40 +0000
@@ -272,7 +272,7 @@
         beginInsertRows(QModelIndex(), index, index);
         m_scopes.append(scope);
         endInsertRows();
-        connect(scope, &Scope::favoriteChanged, [this, scope]{
+        connect(scope, &Scope::favoriteChanged, this, [this, scope]{
             setFavorite(scope->id(), scope->favorite());
         });
     }

=== modified file 'tests/mocks/Unity/fake_scopesoverview.h'
--- tests/mocks/Unity/fake_scopesoverview.h	2015-10-14 12:46:35 +0000
+++ tests/mocks/Unity/fake_scopesoverview.h	2017-01-02 08:48:40 +0000
@@ -34,6 +34,8 @@
     void setSearchQuery(const QString& search_query) override;
     Q_INVOKABLE void activate(QVariant const& result, QString const& categoryId) override;
 
+    using Scope::setFavorite;
+
     // This is implementation detail
     void setFavorite(Scope *scope, bool favorite);
     void moveFavoriteTo(Scope *scope, int index);

=== modified file 'tests/mocks/Utils/windowstatestorage.h'
--- tests/mocks/Utils/windowstatestorage.h	2016-12-02 16:45:50 +0000
+++ tests/mocks/Utils/windowstatestorage.h	2017-01-02 08:48:40 +0000
@@ -25,7 +25,6 @@
 {
     Q_OBJECT
     Q_PROPERTY(QVariantMap geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)
-    Q_ENUMS(WindowState)
 public:
     enum WindowState {
         WindowStateNormal = 1 << 0,
@@ -42,10 +41,9 @@
         WindowStateMaximizedBottomRight = 1 << 11,
         WindowStateRestored = 1 << 12
     };
+    Q_ENUM(WindowState)
     Q_DECLARE_FLAGS(WindowStates, WindowState)
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
     Q_FLAG(WindowStates)
-#endif
 
     WindowStateStorage(QObject *parent = 0);
 

=== modified file 'tests/mocks/libusermetrics/CMakeLists.txt'
--- tests/mocks/libusermetrics/CMakeLists.txt	2013-12-17 14:56:25 +0000
+++ tests/mocks/libusermetrics/CMakeLists.txt	2017-01-02 08:48:40 +0000
@@ -10,6 +10,7 @@
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/plugins/Utils
+    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set_target_properties(MockUserMetrics PROPERTIES

=== modified file 'tests/mocks/libusermetrics/ColorTheme.cpp'
--- tests/mocks/libusermetrics/ColorTheme.cpp	2013-06-14 19:35:25 +0000
+++ tests/mocks/libusermetrics/ColorTheme.cpp	2017-01-02 08:48:40 +0000
@@ -30,6 +30,8 @@
 
 class ColorThemePrivate: QObject
 {
+    Q_OBJECT
+
 public:
     explicit ColorThemePrivate(ColorTheme *parent = 0);
 
@@ -126,3 +128,5 @@
 {
     return d_ptr->m_end;
 }
+
+#include "ColorTheme.moc"

=== modified file 'tests/mocks/libusermetrics/UserMetrics.cpp'
--- tests/mocks/libusermetrics/UserMetrics.cpp	2016-10-27 09:20:20 +0000
+++ tests/mocks/libusermetrics/UserMetrics.cpp	2017-01-02 08:48:40 +0000
@@ -36,6 +36,7 @@
 
 class Q_DECL_EXPORT UserMetricsData: public QObject
 {
+    Q_OBJECT
 public:
     explicit UserMetricsData(QObject *parent);
 
@@ -64,6 +65,7 @@
 
 class UserMetricsPrivate: QObject
 {
+    Q_OBJECT
 public:
     explicit UserMetricsPrivate(UserMetrics *parent);
 
@@ -106,6 +108,7 @@
 
 class UserMetricsDataPrivate: QObject
 {
+    Q_OBJECT
 public:
     explicit UserMetricsDataPrivate(UserMetricsData *parent);
 
@@ -492,3 +495,5 @@
 {
     return new UserMetrics();
 }
+
+#include "UserMetrics.moc"

=== modified file 'tests/plugins/Dash/horizontaljournaltest.cpp'
--- tests/plugins/Dash/horizontaljournaltest.cpp	2016-11-28 09:57:06 +0000
+++ tests/plugins/Dash/horizontaljournaltest.cpp	2017-01-02 08:48:40 +0000
@@ -28,6 +28,7 @@
 #include "horizontaljournal.h"
 
 class WidthModel : public QAbstractListModel {
+    Q_OBJECT
 public:
     QHash<int, QByteArray> roleNames() const override
     {
@@ -85,7 +86,7 @@
     {
         QTRY_COMPARE(item->x(), x);
         QTRY_COMPARE(item->y(), y);
-        QTRY_COMPARE(item->width(), model->stringList()[modelIndex].toDouble());
+        QTRY_COMPARE(item->width(), model->stringList().at(modelIndex).toDouble());
         QTRY_COMPARE(QQuickItemPrivate::get(item)->culled, !visible);
     }
 

=== modified file 'tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp'
--- tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp	2016-11-28 09:57:06 +0000
+++ tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp	2017-01-02 08:48:40 +0000
@@ -28,6 +28,7 @@
 
 class StringListModel : public QAbstractListModel
 {
+    Q_OBJECT
 public:
     StringListModel()
     {

=== modified file 'tests/plugins/Dash/organicgridtest.cpp'
--- tests/plugins/Dash/organicgridtest.cpp	2016-11-28 09:57:06 +0000
+++ tests/plugins/Dash/organicgridtest.cpp	2017-01-02 08:48:40 +0000
@@ -28,6 +28,7 @@
 #include "organicgrid.h"
 
 class DummyModel : public QAbstractListModel {
+    Q_OBJECT
 public:
     DummyModel() : m_count(0) {}
 

=== modified file 'tests/plugins/Dash/verticaljournaltest.cpp'
--- tests/plugins/Dash/verticaljournaltest.cpp	2016-11-28 09:57:06 +0000
+++ tests/plugins/Dash/verticaljournaltest.cpp	2017-01-02 08:48:40 +0000
@@ -28,6 +28,7 @@
 #include "verticaljournal.h"
 
 class HeightModel : public QAbstractListModel {
+    Q_OBJECT
 public:
     QHash<int, QByteArray> roleNames() const override
     {
@@ -100,7 +101,7 @@
         QTRY_COMPARE(item.m_modelIndex, modelIndex);
         QTRY_COMPARE(item.x(), x);
         QTRY_COMPARE(item.y(), y);
-        QTRY_COMPARE(item.height(), model->stringList()[modelIndex].toDouble());
+        QTRY_COMPARE(item.height(), model->stringList().at(modelIndex).toDouble());
         QTRY_COMPARE(QQuickItemPrivate::get(item.m_item)->culled, !visible);
     }
 

=== modified file 'tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp'
--- tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp	2015-10-26 14:05:14 +0000
+++ tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp	2017-01-02 08:48:40 +0000
@@ -34,7 +34,6 @@
     Q_OBJECT
 
 private:
-    LauncherModel *launcherModel;
     QStringList users;
     QHash<QString, QList<QVariantMap>> mockProperties;
 

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-12-07 11:30:41 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2017-01-02 08:48:40 +0000
@@ -101,7 +101,7 @@
         }
         return nullptr;
     }
-    unityapi::ApplicationInfoInterface *findApplicationWithSurface(unityapi::MirSurfaceInterface* surface) const override {
+    unityapi::ApplicationInfoInterface *findApplicationWithSurface(unityapi::MirSurfaceInterface* /*surface*/) const override {
         return nullptr;
     }
     unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) override { return nullptr; }
@@ -501,14 +501,14 @@
         QCOMPARE(spy.count(), 2);
 
         QVariantList countEmissionArgs = spy.takeFirst();
-        QCOMPARE(countEmissionArgs.at(0).value<QModelIndex>().row(), index);
-        QCOMPARE(countEmissionArgs.at(1).value<QModelIndex>().row(), index);
+        QCOMPARE(countEmissionArgs.at(0).toModelIndex().row(), index);
+        QCOMPARE(countEmissionArgs.at(1).toModelIndex().row(), index);
         QVector<int> roles = countEmissionArgs.at(2).value<QVector<int> >();
         QCOMPARE(roles.first(), (int)LauncherModel::RoleCount);
 
         QVariantList countVisibleEmissionArgs = spy.takeFirst();
-        QCOMPARE(countVisibleEmissionArgs.at(0).value<QModelIndex>().row(), index);
-        QCOMPARE(countVisibleEmissionArgs.at(1).value<QModelIndex>().row(), index);
+        QCOMPARE(countVisibleEmissionArgs.at(0).toModelIndex().row(), index);
+        QCOMPARE(countVisibleEmissionArgs.at(1).toModelIndex().row(), index);
         roles = countVisibleEmissionArgs.at(2).value<QVector<int> >();
         QVERIFY(roles.contains(LauncherModel::RoleCountVisible));
         QVERIFY(roles.contains(LauncherModel::RoleAlerting));

=== modified file 'tests/uqmlscene/main.cpp'
--- tests/uqmlscene/main.cpp	2016-05-26 13:15:35 +0000
+++ tests/uqmlscene/main.cpp	2017-01-02 08:48:40 +0000
@@ -243,7 +243,7 @@
 
 static bool checkVersion(const QUrl &url)
 {
-    if (!qgetenv("QMLSCENE_IMPORT_NAME").isEmpty())
+    if (!qEnvironmentVariableIsEmpty("QMLSCENE_IMPORT_NAME"))
         qWarning("QMLSCENE_IMPORT_NAME is no longer supported.");
 
     QString fileName = url.toLocalFile();
@@ -387,9 +387,9 @@
     Options options;
 
     QStringList imports;
-    QList<QPair<QString, QString> > bundles;
+    QVector<QPair<QString, QString> > bundles;
     for (int i = 1; i < argc; ++i) {
-        if (*argv[i] != '-' && QFileInfo(QFile::decodeName(argv[i])).exists()) {
+        if (*argv[i] != '-' && QFileInfo::exists(QFile::decodeName(argv[i]))) {
             options.file = QUrl::fromLocalFile(argv[i]);
         } else {
             const QString lowerArgument = QString::fromLatin1(argv[i]).toLower();

=== modified file 'tests/utils/modules/Unity/Test/testutil.cpp'
--- tests/utils/modules/Unity/Test/testutil.cpp	2016-07-15 11:21:55 +0000
+++ tests/utils/modules/Unity/Test/testutil.cpp	2017-01-02 08:48:40 +0000
@@ -103,7 +103,7 @@
 void TestUtil::ensureTargetWindow()
 {
     if (!m_targetWindow && !QGuiApplication::topLevelWindows().isEmpty())
-        m_targetWindow = QGuiApplication::topLevelWindows()[0];
+        m_targetWindow = QGuiApplication::topLevelWindows().at(0);
 }
 
 void TestUtil::ensureTouchDevice()