Add the Wsuggest-override flag to gcc
While at it mark system includes as such so we don't get warnings we can not fix
commitff75ece6310b338fead50e44a74e785dee722a66
authorAlbert Astals Cid <albert.astals@canonical.com>
dateFri 13 May 2016, 11:50 (10 years ago)
parent7e33496
CMakeLists.txt+6
@@ -40,6 +40,12 @@ if(cmake_build_type_lower MATCHES coverage)
4040 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
4141endif()
4242
43+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
44+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
45+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
46+ endif()
47+endif()
48+
4349# Make sure we have all the needed symbols
4450set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
4551set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")
libs/UbuntuGestures/CMakeLists.txt+1
@@ -34,6 +34,7 @@ endif()
3434
3535# DANGER! DANGER! Using Qt's private API!
3636include_directories(
37+ SYSTEM
3738 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
3839 ${Qt5Quick_INCLUDE_DIRS}
3940 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
libs/UbuntuGestures/TouchRegistry.cpp−3
@@ -19,10 +19,7 @@
1919#include <QCoreApplication>
2020#include <QDebug>
2121
22−#pragma GCC diagnostic push
23−#pragma GCC diagnostic ignored "-pedantic"
2422#include <private/qquickitem_p.h>
25−#pragma GCC diagnostic pop
2623
2724#include "CandidateInactivityTimer.h"
2825#include "Timer.h"
plugins/Cursor/CMakeLists.txt+4
@@ -3,6 +3,10 @@ add_subdirectory(3rd_party)
33include_directories(
44 ${CMAKE_CURRENT_SOURCE_DIR}
55 ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor
6+)
7+
8+include_directories(
9+ SYSTEM
610 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
711)
812
plugins/Dash/CMakeLists.txt+3
@@ -10,6 +10,9 @@ endif()
1010include_directories(
1111 ${CMAKE_CURRENT_SOURCE_DIR}
1212 ${CMAKE_CURRENT_BINARY_DIR}
13+)
14+include_directories(
15+ SYSTEM
1316 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
1417 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
1518 ${Qt5V8_PRIVATE_INCLUDE_DIR}
plugins/Dash/abstractdashview.h+1−3
@@ -21,11 +21,9 @@
2121
2222class QAbstractItemModel;
2323class QQmlComponent;
24−#pragma GCC diagnostic push
25−#pragma GCC diagnostic ignored "-pedantic"
24+
2625#include <private/qqmldelegatemodel_p.h>
2726#include <qqmlinfo.h>
28−#pragma GCC diagnostic pop
2927
3028class AbstractDashView : public QQuickItem
3129{
plugins/Dash/horizontaljournal.cpp−3
@@ -26,12 +26,9 @@
2626#include "horizontaljournal.h"
2727
2828#include <qqmlengine.h>
29−#pragma GCC diagnostic push
30−#pragma GCC diagnostic ignored "-pedantic"
3129#include <private/qqmldelegatemodel_p.h>
3230#include <qqmlinfo.h>
3331#include <private/qquickitem_p.h>
34−#pragma GCC diagnostic pop
3532
3633HorizontalJournal::HorizontalJournal()
3734 : m_firstVisibleIndex(-1)
plugins/Dash/listviewwithpageheader.cpp−3
@@ -95,13 +95,10 @@
9595#include <QDebug>
9696#include <qqmlinfo.h>
9797#include <qqmlengine.h>
98−#pragma GCC diagnostic push
99−#pragma GCC diagnostic ignored "-pedantic"
10098#include <private/qqmldelegatemodel_p.h>
10199#include <private/qqmlglobal_p.h>
102100#include <private/qquickitem_p.h>
103101#include <private/qquickanimation_p.h>
104−#pragma GCC diagnostic pop
105102// #include <private/qquickrectangle_p.h>
106103
107104qreal ListViewWithPageHeader::ListItem::height() const
plugins/Dash/organicgrid.cpp−3
@@ -16,10 +16,7 @@
1616
1717#include "organicgrid.h"
1818
19−#pragma GCC diagnostic push
20−#pragma GCC diagnostic ignored "-pedantic"
2119#include <private/qquickitem_p.h>
22−#pragma GCC diagnostic pop
2320
2421OrganicGrid::OrganicGrid()
2522 : m_firstVisibleIndex(-1)
plugins/Dash/verticaljournal.cpp−3
@@ -27,10 +27,7 @@
2727 */
2828#include "verticaljournal.h"
2929
30−#pragma GCC diagnostic push
31−#pragma GCC diagnostic ignored "-pedantic"
3230#include <private/qquickitem_p.h>
33−#pragma GCC diagnostic pop
3431
3532VerticalJournal::VerticalJournal()
3633 : m_columnWidth(0)
plugins/Lights/CMakeLists.txt+1
@@ -2,6 +2,7 @@ pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
22pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
33
44include_directories(
5+ SYSTEM
56 ${ANDROID_HEADERS_INCLUDE_DIRS}
67)
78
plugins/Lights/android-hardware.h−4
@@ -15,9 +15,5 @@
1515 *
1616 */
1717
18−// The purpose of this header wrapper is just to avoid having warnings being reported on
19−// code from external header files, as we can't do anything about them.
20−#pragma GCC system_header
21−
2218#include <hardware/hardware.h>
2319#include <hardware/lights.h>
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt−1
@@ -1,7 +1,6 @@
11include_directories(
22 ${CMAKE_CURRENT_SOURCE_DIR}
33 ${CMAKE_CURRENT_BINARY_DIR}
4− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
54)
65
76set(DOWNLOADDAEMONLISTENER_SOURCES
plugins/Ubuntu/Gestures/CMakeLists.txt+1
@@ -32,6 +32,7 @@ SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
3232
3333# DANGER! DANGER! Using Qt's private API!
3434include_directories(
35+ SYSTEM
3536 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
3637 ${Qt5Quick_INCLUDE_DIRS}
3738 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp−3
@@ -24,10 +24,7 @@
2424#include <QScreen>
2525#include <QDebug>
2626
27−#pragma GCC diagnostic push
28−#pragma GCC diagnostic ignored "-pedantic"
2927#include <private/qquickwindow_p.h>
30−#pragma GCC diagnostic pop
3128
3229// local
3330#include "TouchOwnershipEvent.h"
plugins/Ubuntu/Gestures/TouchDispatcher.cpp−3
@@ -20,10 +20,7 @@
2020#include <QScopedPointer>
2121#include <QStyleHints>
2222
23−#pragma GCC diagnostic push
24−#pragma GCC diagnostic ignored "-pedantic"
2523#include <private/qquickitem_p.h>
26−#pragma GCC diagnostic pop
2724
2825#define TOUCHDISPATCHER_DEBUG 0
2926
plugins/Unity/Indicators/CMakeLists.txt+3
@@ -7,6 +7,9 @@ include_directories(
77 ${CMAKE_CURRENT_SOURCE_DIR}
88 ${CMAKE_CURRENT_BINARY_DIR}
99 ${GLIB_INCLUDE_DIRS}
10+)
11+include_directories(
12+ SYSTEM
1013 ${GIO_INCLUDE_DIRS}
1114 ${QMENUMODEL_INCLUDE_DIRS}
1215)
plugins/Utils/CMakeLists.txt+4
@@ -1,6 +1,10 @@
11include_directories(
22 ${CMAKE_CURRENT_SOURCE_DIR}
33 ${CMAKE_CURRENT_BINARY_DIR}
4+)
5+
6+include_directories(
7+ SYSTEM
48 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
59 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
610 ${GIO_INCLUDE_DIRS}
plugins/Utils/globalfunctions.cpp−3
@@ -16,10 +16,7 @@
1616
1717#include "globalfunctions.h"
1818
19−#pragma GCC diagnostic push
20−#pragma GCC diagnostic ignored "-pedantic"
2119#include <private/qquickitem_p.h>
22−#pragma GCC diagnostic pop
2320#include <QQmlEngine>
2421
2522GlobalFunctions::GlobalFunctions(QObject *parent)
src/CMakeLists.txt+5−1
@@ -1,8 +1,12 @@
11pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt1)
22
33include_directories(
4− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
54 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
5+)
6+
7+include_directories(
8+ SYSTEM
9+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
610 ${CONNECTIVITY_INCLUDE_DIRS}
711)
812
tests/mocks/Utils/CMakeLists.txt+6−1
@@ -1,12 +1,17 @@
11include_directories(
22 ${CMAKE_CURRENT_SOURCE_DIR}
33 ${CMAKE_CURRENT_BINARY_DIR}
4+ ${CMAKE_SOURCE_DIR}/plugins/Utils
5+)
6+
7+include_directories(
8+ SYSTEM
49 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
510 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
611 ${GIO_INCLUDE_DIRS}
7− ${CMAKE_SOURCE_DIR}/plugins/Utils
812)
913
14+
1015set(QMLPLUGIN_SRC
1116 ${CMAKE_SOURCE_DIR}/plugins/Utils/activefocuslogger.cpp
1217 ${CMAKE_SOURCE_DIR}/plugins/Utils/qlimitproxymodelqml.cpp
tests/plugins/Dash/CMakeLists.txt+4−1
@@ -10,12 +10,15 @@ else()
1010 SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
1111endif()
1212
13−
1413include_directories(
14+ SYSTEM
1515 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
1616 ${Qt5Quick_INCLUDE_DIRS}
1717 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
1818 ${Qt5V8_PRIVATE_INCLUDE_DIR}
19+ )
20+
21+include_directories(
1922 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash
2023 ${CMAKE_CURRENT_BINARY_DIR}
2124 )
tests/plugins/Dash/horizontaljournaltest.cpp−3
@@ -23,10 +23,7 @@
2323#include <QStringListModel>
2424#include <QQmlContext>
2525#include <QQmlEngine>
26−#pragma GCC diagnostic push
27−#pragma GCC diagnostic ignored "-pedantic"
2826#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
3027
3128#include "horizontaljournal.h"
3229
tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp−3
@@ -22,12 +22,9 @@
2222#include <QSignalSpy>
2323#include <QSortFilterProxyModel>
2424#include <QtTestGui>
25−#pragma GCC diagnostic push
26−#pragma GCC diagnostic ignored "-pedantic"
2725#include <private/qqmllistmodel_p.h>
2826#include <private/qquickanimation_p.h>
2927#include <private/qquickitem_p.h>
30−#pragma GCC diagnostic pop
3128
3229class StringListModel : public QAbstractListModel
3330{
tests/plugins/Dash/listviewwithpageheadersectiontest.cpp−3
@@ -21,12 +21,9 @@
2121#include <QQuickView>
2222#include <QSignalSpy>
2323#include <QtTestGui>
24−#pragma GCC diagnostic push
25−#pragma GCC diagnostic ignored "-pedantic"
2624#include <private/qqmllistmodel_p.h>
2725#include <private/qquickanimation_p.h>
2826#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
3027
3128class ListViewWithPageHeaderTestSection : public QObject
3229{
tests/plugins/Dash/listviewwithpageheadertest.cpp−3
@@ -21,12 +21,9 @@
2121#include <QQuickView>
2222#include <QSignalSpy>
2323#include <QtTestGui>
24−#pragma GCC diagnostic push
25−#pragma GCC diagnostic ignored "-pedantic"
2624#include <private/qqmllistmodel_p.h>
2725#include <private/qquickanimation_p.h>
2826#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
3027
3128#include <limits>
3229
tests/plugins/Dash/organicgridtest.cpp−3
@@ -23,10 +23,7 @@
2323#include <QStringListModel>
2424#include <QQmlContext>
2525#include <QQmlEngine>
26−#pragma GCC diagnostic push
27−#pragma GCC diagnostic ignored "-pedantic"
2826#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
3027
3128#include "organicgrid.h"
3229
tests/plugins/Dash/verticaljournaltest.cpp−3
@@ -23,10 +23,7 @@
2323#include <QStringListModel>
2424#include <QQmlContext>
2525#include <QQmlEngine>
26−#pragma GCC diagnostic push
27−#pragma GCC diagnostic ignored "-pedantic"
2826#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
3027
3128#include "verticaljournal.h"
3229
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+2−1
@@ -2,14 +2,15 @@ include(QmlTest)
22
33# DANGER! DANGER! Using Qt's private API!
44include_directories(
5+ SYSTEM
56 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
7+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
68)
79
810include_directories(
911 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
1012 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
1113 ${CMAKE_CURRENT_BINARY_DIR}
12− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
1314 )
1415
1516export_qmlfiles(UbuntuGesturesTest .)
tests/qmltests/Components/CMakeLists.txt+5−1
@@ -6,9 +6,13 @@ include_directories(
66 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
77 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
88 ${CMAKE_CURRENT_BINARY_DIR}
9+ )
10+
11+include_directories(
12+ SYSTEM
913 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
1014 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
11− )
15+)
1216
1317add_executable(DragHandleTestExec tst_DragHandle.cpp)
1418qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
tests/uqmlscene/CMakeLists.txt+5−1
@@ -9,10 +9,14 @@ pkg_check_modules(XCB REQUIRED xcb)
99include_directories(
1010 ${CMAKE_CURRENT_BINARY_DIR}
1111 ${CMAKE_SOURCE_DIR}/src
12− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
1312 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
1413)
1514
15+include_directories(
16+ SYSTEM
17+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
18+)
19+
1620if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
1721 set_target_properties(uqmlscene PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
1822endif()
tests/utils/modules/Unity/Test/CMakeLists.txt+6−2
@@ -3,12 +3,16 @@ include(QmlPlugins)
33add_definitions(-DQT_NO_KEYWORDS)
44
55include_directories(
6− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
7− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
86 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
97 ${CMAKE_SOURCE_DIR}/src
108)
119
10+include_directories(
11+ SYSTEM
12+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
13+ ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
14+)
15+
1216set(UnityTestQML_SOURCES
1317 testutil.cpp
1418 plugin.cpp