Unity 8

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

  1. add_override
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 2343
Merged at revision: 2429
Proposed branch: lp:~aacid/unity8/add_override
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/do_not_animate_panel_color_startup
Diff against target: 129 lines (+13/-13)
9 files modified
plugins/Ubuntu/Gestures/TouchGestureArea.h (+1/-1)
plugins/Unity/InputInfo/plugin.h (+1/-1)
plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h (+3/-3)
tests/mocks/GSettings.1.0/fake_gsettings.h (+2/-2)
tests/mocks/Unity/Application/ApplicationInfo.h (+1/-1)
tests/mocks/Unity/Application/MirSurface.h (+2/-2)
tests/mocks/Unity/InputInfo/plugin.h (+1/-1)
tests/mocks/Unity/Screens/plugin.h (+1/-1)
tests/mocks/Utils/plugin.h (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/add_override
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Approve
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+293258@code.launchpad.net

Commit message

Add override

Description of the change

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

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

 * 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

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2343
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1083/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/632
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/632
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/632
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1454
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1420
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1420
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1420
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1420/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1420
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1420/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1420
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1420/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1420
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1420/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1420
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1420/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1420
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1420/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) :
review: Approve
lp:~aacid/unity8/add_override updated
2344. By Albert Astals Cid

Merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Ubuntu/Gestures/TouchGestureArea.h'
2--- plugins/Ubuntu/Gestures/TouchGestureArea.h 2016-03-11 20:18:12 +0000
3+++ plugins/Ubuntu/Gestures/TouchGestureArea.h 2016-05-05 07:43:40 +0000
4@@ -176,7 +176,7 @@
5 void clicked();
6
7 protected:
8- void itemChange(ItemChange change, const ItemChangeData &value);
9+ void itemChange(ItemChange change, const ItemChangeData &value) override;
10
11 private Q_SLOTS:
12 void rejectGesture();
13
14=== modified file 'plugins/Unity/InputInfo/plugin.h'
15--- plugins/Unity/InputInfo/plugin.h 2015-05-05 11:19:15 +0000
16+++ plugins/Unity/InputInfo/plugin.h 2016-05-05 07:43:40 +0000
17@@ -24,7 +24,7 @@
18 Q_OBJECT
19 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
20 public:
21- void registerTypes(const char *uri);
22+ void registerTypes(const char *uri) override;
23 };
24
25 #endif // INPUTINFO_PLUGIN_H
26
27=== modified file 'plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h'
28--- plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h 2015-10-01 10:58:40 +0000
29+++ plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h 2016-05-05 07:43:40 +0000
30@@ -69,8 +69,8 @@
31 explicit QDeclarativeInputDeviceModel(QObject *parent = 0);
32 virtual ~QDeclarativeInputDeviceModel();
33
34- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
35- int rowCount(const QModelIndex &parent = QModelIndex()) const;
36+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
37+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
38
39 void setDeviceFilter(QInputDevice::InputType filter);
40 QInputDevice::InputType deviceFilter();
41@@ -78,7 +78,7 @@
42 Q_INVOKABLE int indexOf(const QString &devicePath) const;
43
44 Q_INVOKABLE QInputDevice *get(int index) const;
45- QHash<int, QByteArray> roleNames() const;
46+ QHash<int, QByteArray> roleNames() const override;
47
48 Q_SIGNALS:
49 void deviceAdded(const QString &devicePath);
50
51=== modified file 'tests/mocks/GSettings.1.0/fake_gsettings.h'
52--- tests/mocks/GSettings.1.0/fake_gsettings.h 2016-04-14 15:00:44 +0000
53+++ tests/mocks/GSettings.1.0/fake_gsettings.h 2016-05-05 07:43:40 +0000
54@@ -61,8 +61,8 @@
55 public:
56 GSettingsQml(QObject *parent = nullptr);
57
58- void classBegin();
59- void componentComplete();
60+ void classBegin() override;
61+ void componentComplete() override;
62
63 GSettingsSchemaQml * schema() const;
64 QVariant disableHeight() const;
65
66=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
67--- tests/mocks/Unity/Application/ApplicationInfo.h 2016-04-27 15:01:10 +0000
68+++ tests/mocks/Unity/Application/ApplicationInfo.h 2016-05-05 07:43:40 +0000
69@@ -67,7 +67,7 @@
70
71 QUrl icon() const override { return m_icon; }
72
73- Q_INVOKABLE void setStage(Stage value); // invokable only for mock
74+ Q_INVOKABLE void setStage(Stage value) override; // invokable only for mock
75 Stage stage() const override { return m_stage; }
76
77 Q_INVOKABLE void setState(State value);
78
79=== modified file 'tests/mocks/Unity/Application/MirSurface.h'
80--- tests/mocks/Unity/Application/MirSurface.h 2016-04-27 15:01:10 +0000
81+++ tests/mocks/Unity/Application/MirSurface.h 2016-05-05 07:43:40 +0000
82@@ -96,8 +96,8 @@
83 int widthIncrement() const override { return m_widthIncrement; }
84 int heightIncrement() const override { return m_heightIncrement; }
85
86- virtual void setKeymap(const QString &);
87- virtual QString keymap() const;
88+ void setKeymap(const QString &) override;
89+ QString keymap() const override;
90
91 Mir::ShellChrome shellChrome() const override;
92
93
94=== modified file 'tests/mocks/Unity/InputInfo/plugin.h'
95--- tests/mocks/Unity/InputInfo/plugin.h 2015-06-23 14:20:46 +0000
96+++ tests/mocks/Unity/InputInfo/plugin.h 2016-05-05 07:43:40 +0000
97@@ -24,7 +24,7 @@
98 Q_OBJECT
99 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
100 public:
101- void registerTypes(const char *uri);
102+ void registerTypes(const char *uri) override;
103 };
104
105 #endif // INPUTINFO_PLUGIN_H
106
107=== modified file 'tests/mocks/Unity/Screens/plugin.h'
108--- tests/mocks/Unity/Screens/plugin.h 2015-12-02 13:23:45 +0000
109+++ tests/mocks/Unity/Screens/plugin.h 2016-05-05 07:43:40 +0000
110@@ -21,5 +21,5 @@
111 Q_OBJECT
112 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
113 public:
114- virtual void registerTypes(const char* uri);
115+ void registerTypes(const char* uri) override;
116 };
117
118=== modified file 'tests/mocks/Utils/plugin.h'
119--- tests/mocks/Utils/plugin.h 2016-04-29 12:52:53 +0000
120+++ tests/mocks/Utils/plugin.h 2016-05-05 07:43:40 +0000
121@@ -26,7 +26,7 @@
122 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
123
124 public:
125- void registerTypes(const char *uri);
126+ void registerTypes(const char *uri) override;
127 };
128
129 #endif

Subscribers

People subscribed via source and target branches