Unity 8

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

  1. system_includes
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Terry
Approved revision: 2442
Merged at revision: 2516
Proposed branch: lp:~aacid/unity8/system_includes
Merge into: lp:unity8
Diff against target: 445 lines (+48/-53)
27 files modified
plugins/Cursor/CMakeLists.txt (+4/-0)
plugins/Dash/CMakeLists.txt (+4/-0)
plugins/Dash/abstractdashview.h (+1/-3)
plugins/Dash/horizontaljournal.cpp (+1/-4)
plugins/Dash/listviewwithpageheader.cpp (+0/-3)
plugins/Dash/organicgrid.cpp (+0/-3)
plugins/Dash/verticaljournal.cpp (+0/-3)
plugins/Lights/CMakeLists.txt (+1/-0)
plugins/Lights/android-hardware.h (+0/-4)
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt (+0/-1)
plugins/Ubuntu/Gestures/CMakeLists.txt (+5/-1)
plugins/Ubuntu/Gestures/TouchDispatcher.cpp (+0/-4)
plugins/Unity/Indicators/CMakeLists.txt (+4/-0)
plugins/Utils/CMakeLists.txt (+4/-0)
plugins/Utils/globalfunctions.cpp (+1/-4)
src/CMakeLists.txt (+1/-0)
tests/mocks/Utils/CMakeLists.txt (+5/-1)
tests/plugins/Dash/CMakeLists.txt (+4/-0)
tests/plugins/Dash/horizontaljournaltest.cpp (+0/-3)
tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp (+0/-3)
tests/plugins/Dash/listviewwithpageheadersectiontest.cpp (+0/-3)
tests/plugins/Dash/listviewwithpageheadertest.cpp (+0/-3)
tests/plugins/Dash/organicgridtest.cpp (+0/-3)
tests/plugins/Dash/verticaljournaltest.cpp (+0/-3)
tests/plugins/Ubuntu/Gestures/CMakeLists.txt (+3/-2)
tests/qmltests/Components/CMakeLists.txt (+5/-1)
tests/utils/modules/Unity/Test/CMakeLists.txt (+5/-1)
To merge this branch: bzr merge lp:~aacid/unity8/system_includes
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Michael Terry Approve
Review via email: mp+296300@code.launchpad.net

Commit message

Mark system includes as such

Useful so you don't get warnings about unfixable things

Description of the change

 * 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?
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 :

PASSED: Continuous integration, rev:2442
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1364/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1823
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/915
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/915
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/915
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1853
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1794
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1794
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1794
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1785
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1785/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1785
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1785/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1785
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1785/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1785
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1785/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1785
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1785/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1785
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1785/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1785
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1785/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1785
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1785/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1785
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1785/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

LGTM

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2442
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1517/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2020
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1028
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1028
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1028
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2048
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1962
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1962
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1962
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1953
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1953/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1953
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1953/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1953
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1953/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1953
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1953/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1953
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1953/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1953
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1953/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1953
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1953/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1953
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1953/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1953
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1953/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Cursor/CMakeLists.txt'
2--- plugins/Cursor/CMakeLists.txt 2016-05-19 19:44:37 +0000
3+++ plugins/Cursor/CMakeLists.txt 2016-06-02 09:34:16 +0000
4@@ -3,6 +3,10 @@
5 include_directories(
6 ${CMAKE_CURRENT_SOURCE_DIR}
7 ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor
8+)
9+
10+include_directories(
11+ SYSTEM
12 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
13 )
14
15
16=== modified file 'plugins/Dash/CMakeLists.txt'
17--- plugins/Dash/CMakeLists.txt 2015-09-18 07:44:50 +0000
18+++ plugins/Dash/CMakeLists.txt 2016-06-02 09:34:16 +0000
19@@ -10,6 +10,10 @@
20 include_directories(
21 ${CMAKE_CURRENT_SOURCE_DIR}
22 ${CMAKE_CURRENT_BINARY_DIR}
23+)
24+
25+include_directories(
26+ SYSTEM
27 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
28 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
29 ${Qt5V8_PRIVATE_INCLUDE_DIR}
30
31=== modified file 'plugins/Dash/abstractdashview.h'
32--- plugins/Dash/abstractdashview.h 2015-07-15 15:07:19 +0000
33+++ plugins/Dash/abstractdashview.h 2016-06-02 09:34:16 +0000
34@@ -21,11 +21,9 @@
35
36 class QAbstractItemModel;
37 class QQmlComponent;
38-#pragma GCC diagnostic push
39-#pragma GCC diagnostic ignored "-pedantic"
40+
41 #include <private/qqmldelegatemodel_p.h>
42 #include <qqmlinfo.h>
43-#pragma GCC diagnostic pop
44
45 class AbstractDashView : public QQuickItem
46 {
47
48=== modified file 'plugins/Dash/horizontaljournal.cpp'
49--- plugins/Dash/horizontaljournal.cpp 2015-11-20 15:01:39 +0000
50+++ plugins/Dash/horizontaljournal.cpp 2016-06-02 09:34:16 +0000
51@@ -26,12 +26,9 @@
52 #include "horizontaljournal.h"
53
54 #include <qqmlengine.h>
55-#pragma GCC diagnostic push
56-#pragma GCC diagnostic ignored "-pedantic"
57+#include <qqmlinfo.h>
58 #include <private/qqmldelegatemodel_p.h>
59-#include <qqmlinfo.h>
60 #include <private/qquickitem_p.h>
61-#pragma GCC diagnostic pop
62
63 HorizontalJournal::HorizontalJournal()
64 : m_firstVisibleIndex(-1)
65
66=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
67--- plugins/Dash/listviewwithpageheader.cpp 2016-05-27 13:53:57 +0000
68+++ plugins/Dash/listviewwithpageheader.cpp 2016-06-02 09:34:16 +0000
69@@ -95,14 +95,11 @@
70 #include <QDebug>
71 #include <qqmlinfo.h>
72 #include <qqmlengine.h>
73-#pragma GCC diagnostic push
74-#pragma GCC diagnostic ignored "-pedantic"
75 #include <private/qqmlcontext_p.h>
76 #include <private/qqmldelegatemodel_p.h>
77 #include <private/qqmlglobal_p.h>
78 #include <private/qquickitem_p.h>
79 #include <private/qquickanimation_p.h>
80-#pragma GCC diagnostic pop
81 // #include <private/qquickrectangle_p.h>
82
83 qreal ListViewWithPageHeader::ListItem::height() const
84
85=== modified file 'plugins/Dash/organicgrid.cpp'
86--- plugins/Dash/organicgrid.cpp 2015-11-20 15:01:39 +0000
87+++ plugins/Dash/organicgrid.cpp 2016-06-02 09:34:16 +0000
88@@ -16,10 +16,7 @@
89
90 #include "organicgrid.h"
91
92-#pragma GCC diagnostic push
93-#pragma GCC diagnostic ignored "-pedantic"
94 #include <private/qquickitem_p.h>
95-#pragma GCC diagnostic pop
96
97 OrganicGrid::OrganicGrid()
98 : m_firstVisibleIndex(-1)
99
100=== modified file 'plugins/Dash/verticaljournal.cpp'
101--- plugins/Dash/verticaljournal.cpp 2015-11-20 15:01:39 +0000
102+++ plugins/Dash/verticaljournal.cpp 2016-06-02 09:34:16 +0000
103@@ -27,10 +27,7 @@
104 */
105 #include "verticaljournal.h"
106
107-#pragma GCC diagnostic push
108-#pragma GCC diagnostic ignored "-pedantic"
109 #include <private/qquickitem_p.h>
110-#pragma GCC diagnostic pop
111
112 VerticalJournal::VerticalJournal()
113 : m_columnWidth(0)
114
115=== modified file 'plugins/Lights/CMakeLists.txt'
116--- plugins/Lights/CMakeLists.txt 2015-02-03 12:17:50 +0000
117+++ plugins/Lights/CMakeLists.txt 2016-06-02 09:34:16 +0000
118@@ -2,6 +2,7 @@
119 pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
120
121 include_directories(
122+ SYSTEM
123 ${ANDROID_HEADERS_INCLUDE_DIRS}
124 )
125
126
127=== modified file 'plugins/Lights/android-hardware.h'
128--- plugins/Lights/android-hardware.h 2014-09-08 15:07:24 +0000
129+++ plugins/Lights/android-hardware.h 2016-06-02 09:34:16 +0000
130@@ -15,9 +15,5 @@
131 *
132 */
133
134-// The purpose of this header wrapper is just to avoid having warnings being reported on
135-// code from external header files, as we can't do anything about them.
136-#pragma GCC system_header
137-
138 #include <hardware/hardware.h>
139 #include <hardware/lights.h>
140
141=== modified file 'plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
142--- plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt 2014-05-02 22:57:00 +0000
143+++ plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt 2016-06-02 09:34:16 +0000
144@@ -1,7 +1,6 @@
145 include_directories(
146 ${CMAKE_CURRENT_SOURCE_DIR}
147 ${CMAKE_CURRENT_BINARY_DIR}
148- ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
149 )
150
151 set(DOWNLOADDAEMONLISTENER_SOURCES
152
153=== modified file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
154--- plugins/Ubuntu/Gestures/CMakeLists.txt 2016-05-02 07:57:07 +0000
155+++ plugins/Ubuntu/Gestures/CMakeLists.txt 2016-06-02 09:34:16 +0000
156@@ -24,7 +24,10 @@
157 # So that Foo.cpp can #include "Foo.moc"
158 include_directories(${CMAKE_CURRENT_BINARY_DIR})
159
160-include_directories(${UBUNTUGESTURES_INCLUDE_DIRS})
161+include_directories(
162+ SYSTEM
163+ ${UBUNTUGESTURES_INCLUDE_DIRS}
164+)
165
166 # There's no cmake var for v8 include path :-/ so create one
167 LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
168@@ -32,6 +35,7 @@
169
170 # DANGER! DANGER! Using Qt's private API!
171 include_directories(
172+ SYSTEM
173 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
174 ${Qt5Quick_INCLUDE_DIRS}
175 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
176
177=== modified file 'plugins/Ubuntu/Gestures/TouchDispatcher.cpp'
178--- plugins/Ubuntu/Gestures/TouchDispatcher.cpp 2015-04-10 21:16:37 +0000
179+++ plugins/Ubuntu/Gestures/TouchDispatcher.cpp 2016-06-02 09:34:16 +0000
180@@ -19,11 +19,7 @@
181 #include <QGuiApplication>
182 #include <QScopedPointer>
183 #include <QStyleHints>
184-
185-#pragma GCC diagnostic push
186-#pragma GCC diagnostic ignored "-pedantic"
187 #include <private/qquickitem_p.h>
188-#pragma GCC diagnostic pop
189
190 #define TOUCHDISPATCHER_DEBUG 0
191
192
193=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
194--- plugins/Unity/Indicators/CMakeLists.txt 2016-02-01 15:15:09 +0000
195+++ plugins/Unity/Indicators/CMakeLists.txt 2016-06-02 09:34:16 +0000
196@@ -6,6 +6,10 @@
197 include_directories(
198 ${CMAKE_CURRENT_SOURCE_DIR}
199 ${CMAKE_CURRENT_BINARY_DIR}
200+)
201+
202+include_directories(
203+ SYSTEM
204 ${GLIB_INCLUDE_DIRS}
205 ${GIO_INCLUDE_DIRS}
206 ${QMENUMODEL_INCLUDE_DIRS}
207
208=== modified file 'plugins/Utils/CMakeLists.txt'
209--- plugins/Utils/CMakeLists.txt 2016-04-29 20:07:03 +0000
210+++ plugins/Utils/CMakeLists.txt 2016-06-02 09:34:16 +0000
211@@ -1,6 +1,10 @@
212 include_directories(
213 ${CMAKE_CURRENT_SOURCE_DIR}
214 ${CMAKE_CURRENT_BINARY_DIR}
215+)
216+
217+include_directories(
218+ SYSTEM
219 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
220 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
221 ${GIO_INCLUDE_DIRS}
222
223=== modified file 'plugins/Utils/globalfunctions.cpp'
224--- plugins/Utils/globalfunctions.cpp 2016-03-11 20:18:12 +0000
225+++ plugins/Utils/globalfunctions.cpp 2016-06-02 09:34:16 +0000
226@@ -16,11 +16,8 @@
227
228 #include "globalfunctions.h"
229
230-#pragma GCC diagnostic push
231-#pragma GCC diagnostic ignored "-pedantic"
232+#include <QQmlEngine>
233 #include <private/qquickitem_p.h>
234-#pragma GCC diagnostic pop
235-#include <QQmlEngine>
236
237 GlobalFunctions::GlobalFunctions(QObject *parent)
238 : QObject(parent)
239
240=== modified file 'src/CMakeLists.txt'
241--- src/CMakeLists.txt 2016-05-27 13:53:33 +0000
242+++ src/CMakeLists.txt 2016-06-02 09:34:16 +0000
243@@ -1,6 +1,7 @@
244 pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt1)
245
246 include_directories(
247+ SYSTEM
248 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
249 ${CONNECTIVITY_INCLUDE_DIRS}
250 )
251
252=== modified file 'tests/mocks/Utils/CMakeLists.txt'
253--- tests/mocks/Utils/CMakeLists.txt 2016-04-29 20:07:03 +0000
254+++ tests/mocks/Utils/CMakeLists.txt 2016-06-02 09:34:16 +0000
255@@ -1,10 +1,14 @@
256 include_directories(
257 ${CMAKE_CURRENT_SOURCE_DIR}
258 ${CMAKE_CURRENT_BINARY_DIR}
259+ ${CMAKE_SOURCE_DIR}/plugins/Utils
260+)
261+
262+include_directories(
263+ SYSTEM
264 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
265 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
266 ${GIO_INCLUDE_DIRS}
267- ${CMAKE_SOURCE_DIR}/plugins/Utils
268 )
269
270 set(QMLPLUGIN_SRC
271
272=== modified file 'tests/plugins/Dash/CMakeLists.txt'
273--- tests/plugins/Dash/CMakeLists.txt 2015-04-30 20:45:44 +0000
274+++ tests/plugins/Dash/CMakeLists.txt 2016-06-02 09:34:16 +0000
275@@ -12,10 +12,14 @@
276
277
278 include_directories(
279+ SYSTEM
280 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
281 ${Qt5Quick_INCLUDE_DIRS}
282 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
283 ${Qt5V8_PRIVATE_INCLUDE_DIR}
284+ )
285+
286+include_directories(
287 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash
288 ${CMAKE_CURRENT_BINARY_DIR}
289 )
290
291=== modified file 'tests/plugins/Dash/horizontaljournaltest.cpp'
292--- tests/plugins/Dash/horizontaljournaltest.cpp 2015-05-21 15:52:48 +0000
293+++ tests/plugins/Dash/horizontaljournaltest.cpp 2016-06-02 09:34:16 +0000
294@@ -23,10 +23,7 @@
295 #include <QStringListModel>
296 #include <QQmlContext>
297 #include <QQmlEngine>
298-#pragma GCC diagnostic push
299-#pragma GCC diagnostic ignored "-pedantic"
300 #include <private/qquickitem_p.h>
301-#pragma GCC diagnostic pop
302
303 #include "horizontaljournal.h"
304
305
306=== modified file 'tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp'
307--- tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp 2016-03-17 16:02:07 +0000
308+++ tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp 2016-06-02 09:34:16 +0000
309@@ -22,12 +22,9 @@
310 #include <QSignalSpy>
311 #include <QSortFilterProxyModel>
312 #include <QtTestGui>
313-#pragma GCC diagnostic push
314-#pragma GCC diagnostic ignored "-pedantic"
315 #include <private/qqmllistmodel_p.h>
316 #include <private/qquickanimation_p.h>
317 #include <private/qquickitem_p.h>
318-#pragma GCC diagnostic pop
319
320 class StringListModel : public QAbstractListModel
321 {
322
323=== modified file 'tests/plugins/Dash/listviewwithpageheadersectiontest.cpp'
324--- tests/plugins/Dash/listviewwithpageheadersectiontest.cpp 2016-03-24 10:57:21 +0000
325+++ tests/plugins/Dash/listviewwithpageheadersectiontest.cpp 2016-06-02 09:34:16 +0000
326@@ -21,12 +21,9 @@
327 #include <QQuickView>
328 #include <QSignalSpy>
329 #include <QtTestGui>
330-#pragma GCC diagnostic push
331-#pragma GCC diagnostic ignored "-pedantic"
332 #include <private/qqmllistmodel_p.h>
333 #include <private/qquickanimation_p.h>
334 #include <private/qquickitem_p.h>
335-#pragma GCC diagnostic pop
336
337 class ListViewWithPageHeaderTestSection : public QObject
338 {
339
340=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
341--- tests/plugins/Dash/listviewwithpageheadertest.cpp 2016-05-11 12:44:37 +0000
342+++ tests/plugins/Dash/listviewwithpageheadertest.cpp 2016-06-02 09:34:16 +0000
343@@ -21,12 +21,9 @@
344 #include <QQuickView>
345 #include <QSignalSpy>
346 #include <QtTestGui>
347-#pragma GCC diagnostic push
348-#pragma GCC diagnostic ignored "-pedantic"
349 #include <private/qqmllistmodel_p.h>
350 #include <private/qquickanimation_p.h>
351 #include <private/qquickitem_p.h>
352-#pragma GCC diagnostic pop
353
354 #include <limits>
355
356
357=== modified file 'tests/plugins/Dash/organicgridtest.cpp'
358--- tests/plugins/Dash/organicgridtest.cpp 2015-05-21 15:52:48 +0000
359+++ tests/plugins/Dash/organicgridtest.cpp 2016-06-02 09:34:16 +0000
360@@ -23,10 +23,7 @@
361 #include <QStringListModel>
362 #include <QQmlContext>
363 #include <QQmlEngine>
364-#pragma GCC diagnostic push
365-#pragma GCC diagnostic ignored "-pedantic"
366 #include <private/qquickitem_p.h>
367-#pragma GCC diagnostic pop
368
369 #include "organicgrid.h"
370
371
372=== modified file 'tests/plugins/Dash/verticaljournaltest.cpp'
373--- tests/plugins/Dash/verticaljournaltest.cpp 2015-05-21 15:52:48 +0000
374+++ tests/plugins/Dash/verticaljournaltest.cpp 2016-06-02 09:34:16 +0000
375@@ -23,10 +23,7 @@
376 #include <QStringListModel>
377 #include <QQmlContext>
378 #include <QQmlEngine>
379-#pragma GCC diagnostic push
380-#pragma GCC diagnostic ignored "-pedantic"
381 #include <private/qquickitem_p.h>
382-#pragma GCC diagnostic pop
383
384 #include "verticaljournal.h"
385
386
387=== modified file 'tests/plugins/Ubuntu/Gestures/CMakeLists.txt'
388--- tests/plugins/Ubuntu/Gestures/CMakeLists.txt 2016-05-02 07:57:07 +0000
389+++ tests/plugins/Ubuntu/Gestures/CMakeLists.txt 2016-06-02 09:34:16 +0000
390@@ -4,14 +4,15 @@
391
392 # DANGER! DANGER! Using Qt's private API!
393 include_directories(
394+ SYSTEM
395 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
396+ ${UBUNTUGESTURES_INCLUDE_DIRS}
397+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
398 )
399
400 include_directories(
401 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
402- ${UBUNTUGESTURES_INCLUDE_DIRS}
403 ${CMAKE_CURRENT_BINARY_DIR}
404- ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
405 )
406
407 export_qmlfiles(UbuntuGesturesTest .)
408
409=== modified file 'tests/qmltests/Components/CMakeLists.txt'
410--- tests/qmltests/Components/CMakeLists.txt 2016-01-14 10:45:55 +0000
411+++ tests/qmltests/Components/CMakeLists.txt 2016-06-02 09:34:16 +0000
412@@ -6,8 +6,12 @@
413
414 include_directories(
415 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
416+ ${CMAKE_CURRENT_BINARY_DIR}
417+ )
418+
419+include_directories(
420+ SYSTEM
421 ${UBUNTUGESTURES_INCLUDE_DIRS}
422- ${CMAKE_CURRENT_BINARY_DIR}
423 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
424 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
425 ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}
426
427=== modified file 'tests/utils/modules/Unity/Test/CMakeLists.txt'
428--- tests/utils/modules/Unity/Test/CMakeLists.txt 2016-01-13 16:59:06 +0000
429+++ tests/utils/modules/Unity/Test/CMakeLists.txt 2016-06-02 09:34:16 +0000
430@@ -5,10 +5,14 @@
431 pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
432
433 include_directories(
434+ ${CMAKE_SOURCE_DIR}/src
435+)
436+
437+include_directories(
438+ SYSTEM
439 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
440 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
441 ${UBUNTUGESTURES_INCLUDE_DIRS}
442- ${CMAKE_SOURCE_DIR}/src
443 )
444
445 set(UnityTestQML_SOURCES

Subscribers

People subscribed via source and target branches