Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/override-and-debug into lp:qtcreator-plugin-ubuntu
- override-and-debug
- Merge into trunk
Proposed by
Benjamin Zeller
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 466 |
Merged at revision: | 462 |
Proposed branch: | lp:~zeller-benjamin/qtcreator-plugin-ubuntu/override-and-debug |
Merge into: | lp:qtcreator-plugin-ubuntu |
Prerequisite: | lp:~zeller-benjamin/qtcreator-plugin-ubuntu/more-image-info |
Diff against target: |
390 lines (+78/-61) 18 files modified
share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml (+4/-1) src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp (+16/-0) src/ubuntu/device/container/ubuntulocalrunconfiguration.h (+2/-4) src/ubuntu/device/remote/ubuntudevicesignaloperation.h (+4/-4) src/ubuntu/device/remote/ubuntudirectuploadstep.h (+1/-1) src/ubuntu/ubuntuabstractguieditor.h (+5/-5) src/ubuntu/ubuntuabstractguieditordocument.h (+1/-1) src/ubuntu/ubuntuapparmoreditor.h (+3/-3) src/ubuntu/ubuntudevicesmodel.h (+5/-5) src/ubuntu/ubuntueditorfactory.h (+2/-2) src/ubuntu/ubuntufixmanifeststep.h (+3/-3) src/ubuntu/ubuntumanifesteditor.h (+1/-1) src/ubuntu/ubuntumanifesteditorwidget.h (+3/-3) src/ubuntu/ubuntupackageoutputparser.h (+7/-7) src/ubuntu/ubuntuqmlbuildconfiguration.h (+5/-5) src/ubuntu/ubuntuvalidationresultmodel.h (+7/-7) src/ubuntu/ubuntuwelcomemode.h (+5/-5) src/ubuntu/wizards/ubuntuprojectmigrationwizard.h (+4/-4) |
To merge this branch: | bzr merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/override-and-debug |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Approve | ||
ubuntu-sdk-build-bot | continuous-integration | Needs Fixing | |
Review via email: mp+300862@code.launchpad.net |
Commit message
- Add some descriptive text when there is no framework detected for a device
- Mark all virtuals that override with the override keyword
- Fix local debugging by passing the directory where the ld loader is located
Description of the change
- Add some descriptive text when there is no framework detected for a device
- Mark all virtuals that override with the override keyword
- Fix local debugging by passing the directory where the ld loader is located
To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml' | |||
2 | --- share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml 2015-11-24 11:14:08 +0000 | |||
3 | +++ share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml 2016-07-22 10:21:14 +0000 | |||
4 | @@ -372,8 +372,11 @@ | |||
5 | 372 | visible: machineType === DeviceMachineType.Emulator | 372 | visible: machineType === DeviceMachineType.Emulator |
6 | 373 | } | 373 | } |
7 | 374 | ListItem.SingleValue { | 374 | ListItem.SingleValue { |
8 | 375 | property string connTxt: machineType == DeviceMachineType.Emulator ? | ||
9 | 376 | i18n.tr("Please start the emulator to detect the framework version") : | ||
10 | 377 | i18n.tr("Please attach the device to detect the framework version") | ||
11 | 375 | text: i18n.tr("Framework version") | 378 | text: i18n.tr("Framework version") |
13 | 376 | value: frameworkVersion | 379 | value: frameworkVersion.length === 0 ? connTxt : frameworkVersion |
14 | 377 | } | 380 | } |
15 | 378 | ListItem.Standard { | 381 | ListItem.Standard { |
16 | 379 | //show this listitem only when device is not connected | 382 | //show this listitem only when device is not connected |
17 | 380 | 383 | ||
18 | === modified file 'src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp' | |||
19 | --- src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp 2016-05-31 08:21:29 +0000 | |||
20 | +++ src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp 2016-07-22 10:21:14 +0000 | |||
21 | @@ -24,6 +24,7 @@ | |||
22 | 24 | #include <ubuntu/ubuntucmakecache.h> | 24 | #include <ubuntu/ubuntucmakecache.h> |
23 | 25 | #include <ubuntu/ubuntuprojecthelper.h> | 25 | #include <ubuntu/ubuntuprojecthelper.h> |
24 | 26 | #include <ubuntu/ubuntuclicktool.h> | 26 | #include <ubuntu/ubuntuclicktool.h> |
25 | 27 | #include <ubuntu/clicktoolchain.h> | ||
26 | 27 | 28 | ||
27 | 28 | #include <qtsupport/baseqtversion.h> | 29 | #include <qtsupport/baseqtversion.h> |
28 | 29 | #include <qtsupport/qtkitinformation.h> | 30 | #include <qtsupport/qtkitinformation.h> |
29 | @@ -621,6 +622,21 @@ | |||
30 | 621 | QStringList UbuntuLocalRunConfiguration::soLibSearchPaths() const | 622 | QStringList UbuntuLocalRunConfiguration::soLibSearchPaths() const |
31 | 622 | { | 623 | { |
32 | 623 | QStringList paths; | 624 | QStringList paths; |
33 | 625 | |||
34 | 626 | //lets tell GDB explicitely WHERE to look for debug syms | ||
35 | 627 | //otherwise it might try to resolve some symlinks that are broken from the hosts point of view | ||
36 | 628 | ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(target()->kit()); | ||
37 | 629 | ClickToolChain *uTc = nullptr; | ||
38 | 630 | |||
39 | 631 | if (tc && tc->type() == QLatin1String(Constants::UBUNTU_CLICK_TOOLCHAIN_ID)) | ||
40 | 632 | uTc = static_cast<ClickToolChain *>(tc); | ||
41 | 633 | |||
42 | 634 | if (uTc) { | ||
43 | 635 | paths << QString::fromLatin1("%1/lib/%2") | ||
44 | 636 | .arg(UbuntuClickTool::targetBasePath(uTc->clickTarget())) | ||
45 | 637 | .arg(uTc->gnutriplet()); | ||
46 | 638 | } | ||
47 | 639 | |||
48 | 624 | CMakeProjectManager::CMakeProject *cmakeProj | 640 | CMakeProjectManager::CMakeProject *cmakeProj |
49 | 625 | = qobject_cast<CMakeProjectManager::CMakeProject *>(target()->project()); | 641 | = qobject_cast<CMakeProjectManager::CMakeProject *>(target()->project()); |
50 | 626 | 642 | ||
51 | 627 | 643 | ||
52 | === modified file 'src/ubuntu/device/container/ubuntulocalrunconfiguration.h' | |||
53 | --- src/ubuntu/device/container/ubuntulocalrunconfiguration.h 2016-05-23 07:26:49 +0000 | |||
54 | +++ src/ubuntu/device/container/ubuntulocalrunconfiguration.h 2016-07-22 10:21:14 +0000 | |||
55 | @@ -58,16 +58,14 @@ | |||
56 | 58 | bool aboutToStart (QString *errorMessage); | 58 | bool aboutToStart (QString *errorMessage); |
57 | 59 | 59 | ||
58 | 60 | QString appId() const; | 60 | QString appId() const; |
59 | 61 | void addToBaseEnvironment(Utils::Environment &env) const; | ||
60 | 61 | 62 | ||
61 | 62 | // AbstractRemoteLinuxRunConfiguration interface | 63 | // AbstractRemoteLinuxRunConfiguration interface |
62 | 63 | virtual QString localExecutableFilePath() const override; | 64 | virtual QString localExecutableFilePath() const override; |
63 | 64 | virtual QString remoteExecutableFilePath() const override; | 65 | virtual QString remoteExecutableFilePath() const override; |
64 | 65 | virtual QStringList arguments() const override; | 66 | virtual QStringList arguments() const override; |
65 | 66 | virtual Utils::Environment environment() const override; | 67 | virtual Utils::Environment environment() const override; |
70 | 67 | virtual QString workingDirectory() const; | 68 | virtual QString workingDirectory() const override; |
67 | 68 | |||
68 | 69 | // LocalApplicationRunConfiguration interface | ||
69 | 70 | virtual void addToBaseEnvironment(Utils::Environment &env) const; | ||
71 | 71 | 69 | ||
72 | 72 | // RunConfiguration interface | 70 | // RunConfiguration interface |
73 | 73 | virtual bool isConfigured () const override; | 71 | virtual bool isConfigured () const override; |
74 | 74 | 72 | ||
75 | === modified file 'src/ubuntu/device/remote/ubuntudevicesignaloperation.h' | |||
76 | --- src/ubuntu/device/remote/ubuntudevicesignaloperation.h 2016-03-29 09:41:07 +0000 | |||
77 | +++ src/ubuntu/device/remote/ubuntudevicesignaloperation.h 2016-07-22 10:21:14 +0000 | |||
78 | @@ -17,10 +17,10 @@ | |||
79 | 17 | typedef QSharedPointer<UbuntuDeviceSignalOperation> Ptr; | 17 | typedef QSharedPointer<UbuntuDeviceSignalOperation> Ptr; |
80 | 18 | 18 | ||
81 | 19 | // DeviceProcessSignalOperation interface | 19 | // DeviceProcessSignalOperation interface |
86 | 20 | virtual void killProcess(int pid); | 20 | virtual void killProcess(int pid) override; |
87 | 21 | virtual void killProcess(const QString &filePath); | 21 | virtual void killProcess(const QString &filePath) override; |
88 | 22 | virtual void interruptProcess(int pid); | 22 | virtual void interruptProcess(int pid) override; |
89 | 23 | virtual void interruptProcess(const QString &filePath); | 23 | virtual void interruptProcess(const QString &filePath) override; |
90 | 24 | 24 | ||
91 | 25 | private: | 25 | private: |
92 | 26 | void sendSignal (int pid, int signal); | 26 | void sendSignal (int pid, int signal); |
93 | 27 | 27 | ||
94 | === modified file 'src/ubuntu/device/remote/ubuntudirectuploadstep.h' | |||
95 | --- src/ubuntu/device/remote/ubuntudirectuploadstep.h 2016-03-29 10:39:39 +0000 | |||
96 | +++ src/ubuntu/device/remote/ubuntudirectuploadstep.h 2016-07-22 10:21:14 +0000 | |||
97 | @@ -23,7 +23,7 @@ | |||
98 | 23 | // BuildStep interface | 23 | // BuildStep interface |
99 | 24 | virtual void run(QFutureInterface<bool> &fi) override; | 24 | virtual void run(QFutureInterface<bool> &fi) override; |
100 | 25 | 25 | ||
102 | 26 | ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); | 26 | ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; |
103 | 27 | bool initInternal(QString *error = 0) override; | 27 | bool initInternal(QString *error = 0) override; |
104 | 28 | 28 | ||
105 | 29 | RemoteLinux::AbstractRemoteLinuxDeployService *deployService() const override; | 29 | RemoteLinux::AbstractRemoteLinuxDeployService *deployService() const override; |
106 | 30 | 30 | ||
107 | === modified file 'src/ubuntu/ubuntuabstractguieditor.h' | |||
108 | --- src/ubuntu/ubuntuabstractguieditor.h 2015-06-11 14:03:50 +0000 | |||
109 | +++ src/ubuntu/ubuntuabstractguieditor.h 2016-07-22 10:21:14 +0000 | |||
110 | @@ -36,14 +36,14 @@ | |||
111 | 36 | public: | 36 | public: |
112 | 37 | UbuntuAbstractGuiEditor(const Core::Context &context); | 37 | UbuntuAbstractGuiEditor(const Core::Context &context); |
113 | 38 | 38 | ||
115 | 39 | QWidget *toolBar(); | 39 | QWidget *toolBar() override; |
116 | 40 | UbuntuAbstractGuiEditorWidget *editorWidget() const; | 40 | UbuntuAbstractGuiEditorWidget *editorWidget() const; |
118 | 41 | Core::IDocument *document(); | 41 | Core::IDocument *document() override; |
119 | 42 | TextEditor::TextEditorWidget *textEditor() const; | 42 | TextEditor::TextEditorWidget *textEditor() const; |
120 | 43 | 43 | ||
124 | 44 | int currentLine() const; | 44 | int currentLine() const override; |
125 | 45 | int currentColumn() const; | 45 | int currentColumn() const override; |
126 | 46 | void gotoLine(int line, int column = 0) { textEditor()->gotoLine(line, column); } | 46 | void gotoLine(int line, int column = 0, bool centerLine = true) override { textEditor()->gotoLine(line, column, centerLine); } |
127 | 47 | 47 | ||
128 | 48 | protected: | 48 | protected: |
129 | 49 | virtual UbuntuAbstractGuiEditorWidget * createGuiEditor () = 0; | 49 | virtual UbuntuAbstractGuiEditorWidget * createGuiEditor () = 0; |
130 | 50 | 50 | ||
131 | === modified file 'src/ubuntu/ubuntuabstractguieditordocument.h' | |||
132 | --- src/ubuntu/ubuntuabstractguieditordocument.h 2015-03-06 15:02:08 +0000 | |||
133 | +++ src/ubuntu/ubuntuabstractguieditordocument.h 2016-07-22 10:21:14 +0000 | |||
134 | @@ -32,7 +32,7 @@ | |||
135 | 32 | { | 32 | { |
136 | 33 | public: | 33 | public: |
137 | 34 | UbuntuAbstractGuiEditorDocument(const QString &mimeType, UbuntuAbstractGuiEditorWidget *editorWidget); | 34 | UbuntuAbstractGuiEditorDocument(const QString &mimeType, UbuntuAbstractGuiEditorWidget *editorWidget); |
139 | 35 | bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false); | 35 | bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false) override; |
140 | 36 | 36 | ||
141 | 37 | QString defaultPath() const override; | 37 | QString defaultPath() const override; |
142 | 38 | QString suggestedFileName() const override; | 38 | QString suggestedFileName() const override; |
143 | 39 | 39 | ||
144 | === modified file 'src/ubuntu/ubuntuapparmoreditor.h' | |||
145 | --- src/ubuntu/ubuntuapparmoreditor.h 2015-06-11 14:03:50 +0000 | |||
146 | +++ src/ubuntu/ubuntuapparmoreditor.h 2016-07-22 10:21:14 +0000 | |||
147 | @@ -61,10 +61,10 @@ | |||
148 | 61 | 61 | ||
149 | 62 | protected: | 62 | protected: |
150 | 63 | virtual void updateAfterFileLoad() override; | 63 | virtual void updateAfterFileLoad() override; |
152 | 64 | virtual bool syncToWidgets(); | 64 | virtual bool syncToWidgets() override; |
153 | 65 | bool syncToWidgets(UbuntuClickManifest *source); | 65 | bool syncToWidgets(UbuntuClickManifest *source); |
156 | 66 | virtual void syncToSource(); | 66 | virtual void syncToSource() override; |
157 | 67 | virtual QWidget *createMainWidget(); | 67 | virtual QWidget *createMainWidget() override; |
158 | 68 | 68 | ||
159 | 69 | protected slots: | 69 | protected slots: |
160 | 70 | void on_pushButton_addpolicy_clicked(); | 70 | void on_pushButton_addpolicy_clicked(); |
161 | 71 | 71 | ||
162 | === modified file 'src/ubuntu/ubuntudevicesmodel.h' | |||
163 | --- src/ubuntu/ubuntudevicesmodel.h 2016-03-29 09:41:07 +0000 | |||
164 | +++ src/ubuntu/ubuntudevicesmodel.h 2016-07-22 10:21:14 +0000 | |||
165 | @@ -93,11 +93,11 @@ | |||
166 | 93 | UbuntuDevice::ConstPtr device ( const int index ); | 93 | UbuntuDevice::ConstPtr device ( const int index ); |
167 | 94 | 94 | ||
168 | 95 | // QAbstractItemModel interface | 95 | // QAbstractItemModel interface |
174 | 96 | virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; | 96 | virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override; |
175 | 97 | virtual bool setData(const QModelIndex &index, const QVariant &value, int role); | 97 | virtual bool setData(const QModelIndex &index, const QVariant &value, int role) override; |
176 | 98 | virtual QVariant data(const QModelIndex &index, int role) const; | 98 | virtual QVariant data(const QModelIndex &index, int role) const override; |
177 | 99 | virtual QHash<int, QByteArray> roleNames() const; | 99 | virtual QHash<int, QByteArray> roleNames() const override; |
178 | 100 | virtual Qt::ItemFlags flags(const QModelIndex &index) const; | 100 | virtual Qt::ItemFlags flags(const QModelIndex &index) const override; |
179 | 101 | 101 | ||
180 | 102 | bool cancellable() const; | 102 | bool cancellable() const; |
181 | 103 | QString state() const; | 103 | QString state() const; |
182 | 104 | 104 | ||
183 | === modified file 'src/ubuntu/ubuntueditorfactory.h' | |||
184 | --- src/ubuntu/ubuntueditorfactory.h 2014-08-18 12:29:43 +0000 | |||
185 | +++ src/ubuntu/ubuntueditorfactory.h 2016-07-22 10:21:14 +0000 | |||
186 | @@ -11,7 +11,7 @@ | |||
187 | 11 | Q_OBJECT | 11 | Q_OBJECT |
188 | 12 | public: | 12 | public: |
189 | 13 | explicit UbuntuManifestEditorFactory(); | 13 | explicit UbuntuManifestEditorFactory(); |
191 | 14 | Core::IEditor *createEditor(); | 14 | Core::IEditor *createEditor() override; |
192 | 15 | }; | 15 | }; |
193 | 16 | 16 | ||
194 | 17 | class UbuntuApparmorEditorFactory : public Core::IEditorFactory | 17 | class UbuntuApparmorEditorFactory : public Core::IEditorFactory |
195 | @@ -19,7 +19,7 @@ | |||
196 | 19 | Q_OBJECT | 19 | Q_OBJECT |
197 | 20 | public: | 20 | public: |
198 | 21 | explicit UbuntuApparmorEditorFactory(); | 21 | explicit UbuntuApparmorEditorFactory(); |
200 | 22 | Core::IEditor *createEditor(); | 22 | Core::IEditor *createEditor() override; |
201 | 23 | }; | 23 | }; |
202 | 24 | 24 | ||
203 | 25 | } // namespace Internal | 25 | } // namespace Internal |
204 | 26 | 26 | ||
205 | === modified file 'src/ubuntu/ubuntufixmanifeststep.h' | |||
206 | --- src/ubuntu/ubuntufixmanifeststep.h 2015-02-13 12:04:38 +0000 | |||
207 | +++ src/ubuntu/ubuntufixmanifeststep.h 2016-07-22 10:21:14 +0000 | |||
208 | @@ -18,9 +18,9 @@ | |||
209 | 18 | void setPackageDir(const QString &packageDir); | 18 | void setPackageDir(const QString &packageDir); |
210 | 19 | 19 | ||
211 | 20 | // BuildStep interface | 20 | // BuildStep interface |
215 | 21 | virtual bool init(); | 21 | virtual bool init() override; |
216 | 22 | virtual void run(QFutureInterface<bool> &fi); | 22 | virtual void run(QFutureInterface<bool> &fi) override; |
217 | 23 | virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); | 23 | virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; |
218 | 24 | 24 | ||
219 | 25 | private: | 25 | private: |
220 | 26 | QString m_packageDir; | 26 | QString m_packageDir; |
221 | 27 | 27 | ||
222 | === modified file 'src/ubuntu/ubuntumanifesteditor.h' | |||
223 | --- src/ubuntu/ubuntumanifesteditor.h 2014-08-19 06:15:32 +0000 | |||
224 | +++ src/ubuntu/ubuntumanifesteditor.h 2016-07-22 10:21:14 +0000 | |||
225 | @@ -37,7 +37,7 @@ | |||
226 | 37 | 37 | ||
227 | 38 | // UbuntuAbstractGuiEditor interface | 38 | // UbuntuAbstractGuiEditor interface |
228 | 39 | protected: | 39 | protected: |
230 | 40 | virtual UbuntuAbstractGuiEditorWidget *createGuiEditor(); | 40 | virtual UbuntuAbstractGuiEditorWidget *createGuiEditor() override; |
231 | 41 | 41 | ||
232 | 42 | private: | 42 | private: |
233 | 43 | UbuntuManifestEditorWidget *m_editorWidget; | 43 | UbuntuManifestEditorWidget *m_editorWidget; |
234 | 44 | 44 | ||
235 | === modified file 'src/ubuntu/ubuntumanifesteditorwidget.h' | |||
236 | --- src/ubuntu/ubuntumanifesteditorwidget.h 2015-06-11 14:03:50 +0000 | |||
237 | +++ src/ubuntu/ubuntumanifesteditorwidget.h 2016-07-22 10:21:14 +0000 | |||
238 | @@ -49,10 +49,10 @@ | |||
239 | 49 | protected: | 49 | protected: |
240 | 50 | virtual void updateAfterFileLoad() override; | 50 | virtual void updateAfterFileLoad() override; |
241 | 51 | virtual void aboutToOpen(const QString &fileName, const QString &realFileName) override; | 51 | virtual void aboutToOpen(const QString &fileName, const QString &realFileName) override; |
243 | 52 | bool syncToWidgets (); | 52 | bool syncToWidgets () override; |
244 | 53 | bool syncToWidgets (UbuntuClickManifest *source); | 53 | bool syncToWidgets (UbuntuClickManifest *source); |
247 | 54 | void syncToSource (); | 54 | void syncToSource () override; |
248 | 55 | QWidget *createMainWidget(); | 55 | QWidget *createMainWidget() override; |
249 | 56 | void addMissingFieldsToManifest(QString fileName); | 56 | void addMissingFieldsToManifest(QString fileName); |
250 | 57 | 57 | ||
251 | 58 | protected slots: | 58 | protected slots: |
252 | 59 | 59 | ||
253 | === modified file 'src/ubuntu/ubuntupackageoutputparser.h' | |||
254 | --- src/ubuntu/ubuntupackageoutputparser.h 2015-07-08 15:43:11 +0000 | |||
255 | +++ src/ubuntu/ubuntupackageoutputparser.h 2016-07-22 10:21:14 +0000 | |||
256 | @@ -16,9 +16,9 @@ | |||
257 | 16 | 16 | ||
258 | 17 | public: | 17 | public: |
259 | 18 | // IOutputParser interface | 18 | // IOutputParser interface |
263 | 19 | virtual void stdOutput(const QString &line); | 19 | virtual void stdOutput(const QString &line) override; |
264 | 20 | virtual void stdError(const QString &line); | 20 | virtual void stdError(const QString &line) override; |
265 | 21 | virtual bool hasFatalErrors() const; | 21 | virtual bool hasFatalErrors() const override; |
266 | 22 | 22 | ||
267 | 23 | void setTreatAllErrorsAsWarnings ( const bool set ); | 23 | void setTreatAllErrorsAsWarnings ( const bool set ); |
268 | 24 | 24 | ||
269 | @@ -29,7 +29,7 @@ | |||
270 | 29 | void onParsedNewTopLevelItem (ClickRunChecksParser::DataItem* item); | 29 | void onParsedNewTopLevelItem (ClickRunChecksParser::DataItem* item); |
271 | 30 | 30 | ||
272 | 31 | private: | 31 | private: |
274 | 32 | virtual void doFlush(); | 32 | virtual void doFlush() override; |
275 | 33 | void emitTasks (const ClickRunChecksParser::DataItem *item, int level = 0); | 33 | void emitTasks (const ClickRunChecksParser::DataItem *item, int level = 0); |
276 | 34 | bool isError (const ClickRunChecksParser::DataItem *item); | 34 | bool isError (const ClickRunChecksParser::DataItem *item); |
277 | 35 | ClickRunChecksParser m_subParser; | 35 | ClickRunChecksParser m_subParser; |
278 | @@ -45,9 +45,9 @@ | |||
279 | 45 | 45 | ||
280 | 46 | // ITaskHandler interface | 46 | // ITaskHandler interface |
281 | 47 | public: | 47 | public: |
285 | 48 | virtual bool canHandle(const ProjectExplorer::Task &task) const; | 48 | virtual bool canHandle(const ProjectExplorer::Task &task) const override; |
286 | 49 | virtual void handle(const ProjectExplorer::Task &task); | 49 | virtual void handle(const ProjectExplorer::Task &task) override; |
287 | 50 | virtual QAction *createAction(QObject *parent) const; | 50 | virtual QAction *createAction(QObject *parent) const override; |
288 | 51 | 51 | ||
289 | 52 | private: | 52 | private: |
290 | 53 | QUrl getUrl (const ProjectExplorer::Task &task) const; | 53 | QUrl getUrl (const ProjectExplorer::Task &task) const; |
291 | 54 | 54 | ||
292 | === modified file 'src/ubuntu/ubuntuqmlbuildconfiguration.h' | |||
293 | --- src/ubuntu/ubuntuqmlbuildconfiguration.h 2015-04-17 09:21:16 +0000 | |||
294 | +++ src/ubuntu/ubuntuqmlbuildconfiguration.h 2016-07-22 10:21:14 +0000 | |||
295 | @@ -57,8 +57,8 @@ | |||
296 | 57 | UbuntuQmlUpdateTranslationTemplateStep(ProjectExplorer::BuildStepList *bsl, UbuntuQmlUpdateTranslationTemplateStep *bs); | 57 | UbuntuQmlUpdateTranslationTemplateStep(ProjectExplorer::BuildStepList *bsl, UbuntuQmlUpdateTranslationTemplateStep *bs); |
297 | 58 | 58 | ||
298 | 59 | // BuildStep interface | 59 | // BuildStep interface |
301 | 60 | virtual bool init(); | 60 | virtual bool init() override; |
302 | 61 | virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); | 61 | virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; |
303 | 62 | 62 | ||
304 | 63 | QString makeCommand(ProjectExplorer::ToolChain *tc, const Utils::Environment &env) const; | 63 | QString makeCommand(ProjectExplorer::ToolChain *tc, const Utils::Environment &env) const; |
305 | 64 | }; | 64 | }; |
306 | @@ -71,9 +71,9 @@ | |||
307 | 71 | UbuntuQmlBuildTranslationStep(ProjectExplorer::BuildStepList *bsl, UbuntuQmlBuildTranslationStep *bs); | 71 | UbuntuQmlBuildTranslationStep(ProjectExplorer::BuildStepList *bsl, UbuntuQmlBuildTranslationStep *bs); |
308 | 72 | 72 | ||
309 | 73 | // BuildStep interface | 73 | // BuildStep interface |
313 | 74 | virtual bool init(); | 74 | virtual bool init() override; |
314 | 75 | virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); | 75 | virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; |
315 | 76 | void run(QFutureInterface<bool> &fi); | 76 | void run(QFutureInterface<bool> &fi) override; |
316 | 77 | 77 | ||
317 | 78 | private: | 78 | private: |
318 | 79 | QString m_translationDir; | 79 | QString m_translationDir; |
319 | 80 | 80 | ||
320 | === modified file 'src/ubuntu/ubuntuvalidationresultmodel.h' | |||
321 | --- src/ubuntu/ubuntuvalidationresultmodel.h 2015-03-03 17:23:52 +0000 | |||
322 | +++ src/ubuntu/ubuntuvalidationresultmodel.h 2016-07-22 10:21:14 +0000 | |||
323 | @@ -92,13 +92,13 @@ | |||
324 | 92 | ~UbuntuValidationResultModel(); | 92 | ~UbuntuValidationResultModel(); |
325 | 93 | 93 | ||
326 | 94 | // QAbstractItemModel interface | 94 | // QAbstractItemModel interface |
334 | 95 | virtual QModelIndex index(int row, int column, const QModelIndex &parent) const; | 95 | virtual QModelIndex index(int row, int column, const QModelIndex &parent) const override; |
335 | 96 | virtual QModelIndex parent(const QModelIndex &child) const; | 96 | virtual QModelIndex parent(const QModelIndex &child) const override; |
336 | 97 | virtual int rowCount(const QModelIndex &parent) const; | 97 | virtual int rowCount(const QModelIndex &parent) const override; |
337 | 98 | virtual int columnCount(const QModelIndex &parent) const; | 98 | virtual int columnCount(const QModelIndex &parent) const override; |
338 | 99 | virtual QVariant data(const QModelIndex &index, int role) const; | 99 | virtual QVariant data(const QModelIndex &index, int role) const override; |
339 | 100 | virtual Qt::ItemFlags flags(const QModelIndex &index) const; | 100 | virtual Qt::ItemFlags flags(const QModelIndex &index) const override; |
340 | 101 | virtual QHash<int, QByteArray> roleNames() const; | 101 | virtual QHash<int, QByteArray> roleNames() const override; |
341 | 102 | 102 | ||
342 | 103 | QModelIndex findFirstErrorItem () const; | 103 | QModelIndex findFirstErrorItem () const; |
343 | 104 | 104 | ||
344 | 105 | 105 | ||
345 | === modified file 'src/ubuntu/ubuntuwelcomemode.h' | |||
346 | --- src/ubuntu/ubuntuwelcomemode.h 2016-04-19 12:09:54 +0000 | |||
347 | +++ src/ubuntu/ubuntuwelcomemode.h 2016-07-22 10:21:14 +0000 | |||
348 | @@ -32,11 +32,11 @@ | |||
349 | 32 | 32 | ||
350 | 33 | public: | 33 | public: |
351 | 34 | // IWelcomePage interface | 34 | // IWelcomePage interface |
357 | 35 | virtual QUrl pageLocation() const; | 35 | virtual QUrl pageLocation() const override; |
358 | 36 | virtual QString title() const; | 36 | virtual QString title() const override; |
359 | 37 | virtual int priority() const; | 37 | virtual int priority() const override; |
360 | 38 | virtual void facilitateQml(QQmlEngine *engine); | 38 | virtual void facilitateQml(QQmlEngine *engine) override; |
361 | 39 | virtual Core::Id id() const; | 39 | virtual Core::Id id() const override; |
362 | 40 | 40 | ||
363 | 41 | public slots: | 41 | public slots: |
364 | 42 | void newProject(); | 42 | void newProject(); |
365 | 43 | 43 | ||
366 | === modified file 'src/ubuntu/wizards/ubuntuprojectmigrationwizard.h' | |||
367 | --- src/ubuntu/wizards/ubuntuprojectmigrationwizard.h 2014-12-02 14:20:35 +0000 | |||
368 | +++ src/ubuntu/wizards/ubuntuprojectmigrationwizard.h 2016-07-22 10:21:14 +0000 | |||
369 | @@ -50,8 +50,8 @@ | |||
370 | 50 | 50 | ||
371 | 51 | // QWizardPage interface | 51 | // QWizardPage interface |
372 | 52 | public: | 52 | public: |
375 | 53 | virtual void initializePage(); | 53 | virtual void initializePage() override; |
376 | 54 | virtual bool isComplete() const; | 54 | virtual bool isComplete() const override; |
377 | 55 | }; | 55 | }; |
378 | 56 | 56 | ||
379 | 57 | class UbuntuProjectDetailsPage : public QWizardPage | 57 | class UbuntuProjectDetailsPage : public QWizardPage |
380 | @@ -62,8 +62,8 @@ | |||
381 | 62 | 62 | ||
382 | 63 | // QWizardPage interface | 63 | // QWizardPage interface |
383 | 64 | public: | 64 | public: |
386 | 65 | virtual void initializePage(); | 65 | virtual void initializePage() override; |
387 | 66 | virtual bool isComplete() const; | 66 | virtual bool isComplete() const override; |
388 | 67 | 67 | ||
389 | 68 | private: | 68 | private: |
390 | 69 | bool m_initialized; | 69 | bool m_initialized; |
FAILED: Continuous integration, rev:466 /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/49/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/4609/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/49/ rebuild
https:/