git.iko.soy/unity8
on xenial help sign in
Add the Wsuggest-override flag to gcc
ff75eceAlbert Astals Cid
CMakeLists.txt+6
compare with xenial
unifiedsplit
@@ -40,6 +40,12 @@ if(cmake_build_type_lower MATCHES coverage)
40 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
40 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
41endif()
41endif()
42
42
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+
43# Make sure we have all the needed symbols
49# Make sure we have all the needed symbols
44set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
50set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
45set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")
51set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")
libs/UbuntuGestures/CMakeLists.txt+1
@@ -34,6 +34,7 @@ endif()
34
34
35# DANGER! DANGER! Using Qt's private API!
35# DANGER! DANGER! Using Qt's private API!
36include_directories(
36include_directories(
37+ SYSTEM
37 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
38 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
38 ${Qt5Quick_INCLUDE_DIRS}
39 ${Qt5Quick_INCLUDE_DIRS}
39 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
40 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
libs/UbuntuGestures/TouchRegistry.cpp−3
@@ -19,10 +19,7 @@
19#include <QCoreApplication>
19#include <QCoreApplication>
20#include <QDebug>
20#include <QDebug>
21
21
22−#pragma GCC diagnostic push
23−#pragma GCC diagnostic ignored "-pedantic"
24#include <private/qquickitem_p.h>
22#include <private/qquickitem_p.h>
25−#pragma GCC diagnostic pop
26
23
27#include "CandidateInactivityTimer.h"
24#include "CandidateInactivityTimer.h"
28#include "Timer.h"
25#include "Timer.h"
plugins/Cursor/CMakeLists.txt+4
@@ -3,6 +3,10 @@ add_subdirectory(3rd_party)
3include_directories(
3include_directories(
4 ${CMAKE_CURRENT_SOURCE_DIR}
4 ${CMAKE_CURRENT_SOURCE_DIR}
5 ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor
5 ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor
6+)
7+
8+include_directories(
9+ SYSTEM
6 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
10 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
7)
11)
8
12
plugins/Dash/CMakeLists.txt+3
@@ -10,6 +10,9 @@ endif()
10include_directories(
10include_directories(
11 ${CMAKE_CURRENT_SOURCE_DIR}
11 ${CMAKE_CURRENT_SOURCE_DIR}
12 ${CMAKE_CURRENT_BINARY_DIR}
12 ${CMAKE_CURRENT_BINARY_DIR}
13+)
14+include_directories(
15+ SYSTEM
13 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
16 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
14 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
17 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
15 ${Qt5V8_PRIVATE_INCLUDE_DIR}
18 ${Qt5V8_PRIVATE_INCLUDE_DIR}
plugins/Dash/abstractdashview.h+1−3
@@ -21,11 +21,9 @@
21
21
22class QAbstractItemModel;
22class QAbstractItemModel;
23class QQmlComponent;
23class QQmlComponent;
24−#pragma GCC diagnostic push
24+
25−#pragma GCC diagnostic ignored "-pedantic"
26#include <private/qqmldelegatemodel_p.h>
25#include <private/qqmldelegatemodel_p.h>
27#include <qqmlinfo.h>
26#include <qqmlinfo.h>
28−#pragma GCC diagnostic pop
29
27
30class AbstractDashView : public QQuickItem
28class AbstractDashView : public QQuickItem
31{
29{
plugins/Dash/horizontaljournal.cpp−3
@@ -26,12 +26,9 @@
26#include "horizontaljournal.h"
26#include "horizontaljournal.h"
27
27
28#include <qqmlengine.h>
28#include <qqmlengine.h>
29−#pragma GCC diagnostic push
30−#pragma GCC diagnostic ignored "-pedantic"
31#include <private/qqmldelegatemodel_p.h>
29#include <private/qqmldelegatemodel_p.h>
32#include <qqmlinfo.h>
30#include <qqmlinfo.h>
33#include <private/qquickitem_p.h>
31#include <private/qquickitem_p.h>
34−#pragma GCC diagnostic pop
35
32
36HorizontalJournal::HorizontalJournal()
33HorizontalJournal::HorizontalJournal()
37 : m_firstVisibleIndex(-1)
34 : m_firstVisibleIndex(-1)
plugins/Dash/listviewwithpageheader.cpp−3
@@ -95,13 +95,10 @@
95#include <QDebug>
95#include <QDebug>
96#include <qqmlinfo.h>
96#include <qqmlinfo.h>
97#include <qqmlengine.h>
97#include <qqmlengine.h>
98−#pragma GCC diagnostic push
99−#pragma GCC diagnostic ignored "-pedantic"
100#include <private/qqmldelegatemodel_p.h>
98#include <private/qqmldelegatemodel_p.h>
101#include <private/qqmlglobal_p.h>
99#include <private/qqmlglobal_p.h>
102#include <private/qquickitem_p.h>
100#include <private/qquickitem_p.h>
103#include <private/qquickanimation_p.h>
101#include <private/qquickanimation_p.h>
104−#pragma GCC diagnostic pop
105// #include <private/qquickrectangle_p.h>
102// #include <private/qquickrectangle_p.h>
106
103
107qreal ListViewWithPageHeader::ListItem::height() const
104qreal ListViewWithPageHeader::ListItem::height() const
plugins/Dash/organicgrid.cpp−3
@@ -16,10 +16,7 @@
16
16
17#include "organicgrid.h"
17#include "organicgrid.h"
18
18
19−#pragma GCC diagnostic push
20−#pragma GCC diagnostic ignored "-pedantic"
21#include <private/qquickitem_p.h>
19#include <private/qquickitem_p.h>
22−#pragma GCC diagnostic pop
23
20
24OrganicGrid::OrganicGrid()
21OrganicGrid::OrganicGrid()
25 : m_firstVisibleIndex(-1)
22 : m_firstVisibleIndex(-1)
plugins/Dash/verticaljournal.cpp−3
@@ -27,10 +27,7 @@
27 */
27 */
28#include "verticaljournal.h"
28#include "verticaljournal.h"
29
29
30−#pragma GCC diagnostic push
31−#pragma GCC diagnostic ignored "-pedantic"
32#include <private/qquickitem_p.h>
30#include <private/qquickitem_p.h>
33−#pragma GCC diagnostic pop
34
31
35VerticalJournal::VerticalJournal()
32VerticalJournal::VerticalJournal()
36 : m_columnWidth(0)
33 : m_columnWidth(0)
plugins/Lights/CMakeLists.txt+1
@@ -2,6 +2,7 @@ pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
2pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
2pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
3
3
4include_directories(
4include_directories(
5+ SYSTEM
5 ${ANDROID_HEADERS_INCLUDE_DIRS}
6 ${ANDROID_HEADERS_INCLUDE_DIRS}
6)
7)
7
8
plugins/Lights/android-hardware.h−4
@@ -15,9 +15,5 @@
15 *
15 *
16 */
16 */
17
17
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−
22#include <hardware/hardware.h>
18#include <hardware/hardware.h>
23#include <hardware/lights.h>
19#include <hardware/lights.h>
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt−1
@@ -1,7 +1,6 @@
1include_directories(
1include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
2 ${CMAKE_CURRENT_SOURCE_DIR}
3 ${CMAKE_CURRENT_BINARY_DIR}
3 ${CMAKE_CURRENT_BINARY_DIR}
4− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
5)
4)
6
5
7set(DOWNLOADDAEMONLISTENER_SOURCES
6set(DOWNLOADDAEMONLISTENER_SOURCES
plugins/Ubuntu/Gestures/CMakeLists.txt+1
@@ -32,6 +32,7 @@ SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
32
32
33# DANGER! DANGER! Using Qt's private API!
33# DANGER! DANGER! Using Qt's private API!
34include_directories(
34include_directories(
35+ SYSTEM
35 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
36 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
36 ${Qt5Quick_INCLUDE_DIRS}
37 ${Qt5Quick_INCLUDE_DIRS}
37 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
38 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp−3
@@ -24,10 +24,7 @@
24#include <QScreen>
24#include <QScreen>
25#include <QDebug>
25#include <QDebug>
26
26
27−#pragma GCC diagnostic push
28−#pragma GCC diagnostic ignored "-pedantic"
29#include <private/qquickwindow_p.h>
27#include <private/qquickwindow_p.h>
30−#pragma GCC diagnostic pop
31
28
32// local
29// local
33#include "TouchOwnershipEvent.h"
30#include "TouchOwnershipEvent.h"
plugins/Ubuntu/Gestures/TouchDispatcher.cpp−3
@@ -20,10 +20,7 @@
20#include <QScopedPointer>
20#include <QScopedPointer>
21#include <QStyleHints>
21#include <QStyleHints>
22
22
23−#pragma GCC diagnostic push
24−#pragma GCC diagnostic ignored "-pedantic"
25#include <private/qquickitem_p.h>
23#include <private/qquickitem_p.h>
26−#pragma GCC diagnostic pop
27
24
28#define TOUCHDISPATCHER_DEBUG 0
25#define TOUCHDISPATCHER_DEBUG 0
29
26
plugins/Unity/Indicators/CMakeLists.txt+3
@@ -7,6 +7,9 @@ include_directories(
7 ${CMAKE_CURRENT_SOURCE_DIR}
7 ${CMAKE_CURRENT_SOURCE_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
9 ${GLIB_INCLUDE_DIRS}
9 ${GLIB_INCLUDE_DIRS}
10+)
11+include_directories(
12+ SYSTEM
10 ${GIO_INCLUDE_DIRS}
13 ${GIO_INCLUDE_DIRS}
11 ${QMENUMODEL_INCLUDE_DIRS}
14 ${QMENUMODEL_INCLUDE_DIRS}
12)
15)
plugins/Utils/CMakeLists.txt+4
@@ -1,6 +1,10 @@
1include_directories(
1include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
2 ${CMAKE_CURRENT_SOURCE_DIR}
3 ${CMAKE_CURRENT_BINARY_DIR}
3 ${CMAKE_CURRENT_BINARY_DIR}
4+)
5+
6+include_directories(
7+ SYSTEM
4 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
8 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
5 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
9 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
6 ${GIO_INCLUDE_DIRS}
10 ${GIO_INCLUDE_DIRS}
plugins/Utils/globalfunctions.cpp−3
@@ -16,10 +16,7 @@
16
16
17#include "globalfunctions.h"
17#include "globalfunctions.h"
18
18
19−#pragma GCC diagnostic push
20−#pragma GCC diagnostic ignored "-pedantic"
21#include <private/qquickitem_p.h>
19#include <private/qquickitem_p.h>
22−#pragma GCC diagnostic pop
23#include <QQmlEngine>
20#include <QQmlEngine>
24
21
25GlobalFunctions::GlobalFunctions(QObject *parent)
22GlobalFunctions::GlobalFunctions(QObject *parent)
src/CMakeLists.txt+5−1
@@ -1,8 +1,12 @@
1pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt1)
1pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt1)
2
2
3include_directories(
3include_directories(
4− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
5 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
4 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
5+)
6+
7+include_directories(
8+ SYSTEM
9+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
6 ${CONNECTIVITY_INCLUDE_DIRS}
10 ${CONNECTIVITY_INCLUDE_DIRS}
7)
11)
8
12
tests/mocks/Utils/CMakeLists.txt+6−1
@@ -1,12 +1,17 @@
1include_directories(
1include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
2 ${CMAKE_CURRENT_SOURCE_DIR}
3 ${CMAKE_CURRENT_BINARY_DIR}
3 ${CMAKE_CURRENT_BINARY_DIR}
4+ ${CMAKE_SOURCE_DIR}/plugins/Utils
5+)
6+
7+include_directories(
8+ SYSTEM
4 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
9 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
5 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
10 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
6 ${GIO_INCLUDE_DIRS}
11 ${GIO_INCLUDE_DIRS}
7− ${CMAKE_SOURCE_DIR}/plugins/Utils
8)
12)
9
13
14+
10set(QMLPLUGIN_SRC
15set(QMLPLUGIN_SRC
11 ${CMAKE_SOURCE_DIR}/plugins/Utils/activefocuslogger.cpp
16 ${CMAKE_SOURCE_DIR}/plugins/Utils/activefocuslogger.cpp
12 ${CMAKE_SOURCE_DIR}/plugins/Utils/qlimitproxymodelqml.cpp
17 ${CMAKE_SOURCE_DIR}/plugins/Utils/qlimitproxymodelqml.cpp
tests/plugins/Dash/CMakeLists.txt+4−1
@@ -10,12 +10,15 @@ else()
10 SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
10 SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
11endif()
11endif()
12
12
13−
14include_directories(
13include_directories(
14+ SYSTEM
15 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
15 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
16 ${Qt5Quick_INCLUDE_DIRS}
16 ${Qt5Quick_INCLUDE_DIRS}
17 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
17 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
18 ${Qt5V8_PRIVATE_INCLUDE_DIR}
18 ${Qt5V8_PRIVATE_INCLUDE_DIR}
19+ )
20+
21+include_directories(
19 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash
22 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash
20 ${CMAKE_CURRENT_BINARY_DIR}
23 ${CMAKE_CURRENT_BINARY_DIR}
21 )
24 )
tests/plugins/Dash/horizontaljournaltest.cpp−3
@@ -23,10 +23,7 @@
23#include <QStringListModel>
23#include <QStringListModel>
24#include <QQmlContext>
24#include <QQmlContext>
25#include <QQmlEngine>
25#include <QQmlEngine>
26−#pragma GCC diagnostic push
27−#pragma GCC diagnostic ignored "-pedantic"
28#include <private/qquickitem_p.h>
26#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
30
27
31#include "horizontaljournal.h"
28#include "horizontaljournal.h"
32
29
tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp−3
@@ -22,12 +22,9 @@
22#include <QSignalSpy>
22#include <QSignalSpy>
23#include <QSortFilterProxyModel>
23#include <QSortFilterProxyModel>
24#include <QtTestGui>
24#include <QtTestGui>
25−#pragma GCC diagnostic push
26−#pragma GCC diagnostic ignored "-pedantic"
27#include <private/qqmllistmodel_p.h>
25#include <private/qqmllistmodel_p.h>
28#include <private/qquickanimation_p.h>
26#include <private/qquickanimation_p.h>
29#include <private/qquickitem_p.h>
27#include <private/qquickitem_p.h>
30−#pragma GCC diagnostic pop
31
28
32class StringListModel : public QAbstractListModel
29class StringListModel : public QAbstractListModel
33{
30{
tests/plugins/Dash/listviewwithpageheadersectiontest.cpp−3
@@ -21,12 +21,9 @@
21#include <QQuickView>
21#include <QQuickView>
22#include <QSignalSpy>
22#include <QSignalSpy>
23#include <QtTestGui>
23#include <QtTestGui>
24−#pragma GCC diagnostic push
25−#pragma GCC diagnostic ignored "-pedantic"
26#include <private/qqmllistmodel_p.h>
24#include <private/qqmllistmodel_p.h>
27#include <private/qquickanimation_p.h>
25#include <private/qquickanimation_p.h>
28#include <private/qquickitem_p.h>
26#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
30
27
31class ListViewWithPageHeaderTestSection : public QObject
28class ListViewWithPageHeaderTestSection : public QObject
32{
29{
tests/plugins/Dash/listviewwithpageheadertest.cpp−3
@@ -21,12 +21,9 @@
21#include <QQuickView>
21#include <QQuickView>
22#include <QSignalSpy>
22#include <QSignalSpy>
23#include <QtTestGui>
23#include <QtTestGui>
24−#pragma GCC diagnostic push
25−#pragma GCC diagnostic ignored "-pedantic"
26#include <private/qqmllistmodel_p.h>
24#include <private/qqmllistmodel_p.h>
27#include <private/qquickanimation_p.h>
25#include <private/qquickanimation_p.h>
28#include <private/qquickitem_p.h>
26#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
30
27
31#include <limits>
28#include <limits>
32
29
tests/plugins/Dash/organicgridtest.cpp−3
@@ -23,10 +23,7 @@
23#include <QStringListModel>
23#include <QStringListModel>
24#include <QQmlContext>
24#include <QQmlContext>
25#include <QQmlEngine>
25#include <QQmlEngine>
26−#pragma GCC diagnostic push
27−#pragma GCC diagnostic ignored "-pedantic"
28#include <private/qquickitem_p.h>
26#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
30
27
31#include "organicgrid.h"
28#include "organicgrid.h"
32
29
tests/plugins/Dash/verticaljournaltest.cpp−3
@@ -23,10 +23,7 @@
23#include <QStringListModel>
23#include <QStringListModel>
24#include <QQmlContext>
24#include <QQmlContext>
25#include <QQmlEngine>
25#include <QQmlEngine>
26−#pragma GCC diagnostic push
27−#pragma GCC diagnostic ignored "-pedantic"
28#include <private/qquickitem_p.h>
26#include <private/qquickitem_p.h>
29−#pragma GCC diagnostic pop
30
27
31#include "verticaljournal.h"
28#include "verticaljournal.h"
32
29
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+2−1
@@ -2,14 +2,15 @@ include(QmlTest)
2
2
3# DANGER! DANGER! Using Qt's private API!
3# DANGER! DANGER! Using Qt's private API!
4include_directories(
4include_directories(
5+ SYSTEM
5 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
6 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
7+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
6)
8)
7
9
8include_directories(
10include_directories(
9 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
11 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
10 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
12 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
11 ${CMAKE_CURRENT_BINARY_DIR}
13 ${CMAKE_CURRENT_BINARY_DIR}
12− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
13 )
14 )
14
15
15export_qmlfiles(UbuntuGesturesTest .)
16export_qmlfiles(UbuntuGesturesTest .)
tests/qmltests/Components/CMakeLists.txt+5−1
@@ -6,9 +6,13 @@ include_directories(
6 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
6 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
7 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
7 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
8 ${CMAKE_CURRENT_BINARY_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
9+ )
10+
11+include_directories(
12+ SYSTEM
9 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
13 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
10 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
14 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
11− )
15+)
12
16
13add_executable(DragHandleTestExec tst_DragHandle.cpp)
17add_executable(DragHandleTestExec tst_DragHandle.cpp)
14qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
18qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
tests/uqmlscene/CMakeLists.txt+5−1
@@ -9,10 +9,14 @@ pkg_check_modules(XCB REQUIRED xcb)
9include_directories(
9include_directories(
10 ${CMAKE_CURRENT_BINARY_DIR}
10 ${CMAKE_CURRENT_BINARY_DIR}
11 ${CMAKE_SOURCE_DIR}/src
11 ${CMAKE_SOURCE_DIR}/src
12− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
13 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
12 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
14)
13)
15
14
15+include_directories(
16+ SYSTEM
17+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
18+)
19+
16if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
20if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
17 set_target_properties(uqmlscene PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
21 set_target_properties(uqmlscene PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
18endif()
22endif()
tests/utils/modules/Unity/Test/CMakeLists.txt+6−2
@@ -3,12 +3,16 @@ include(QmlPlugins)
3add_definitions(-DQT_NO_KEYWORDS)
3add_definitions(-DQT_NO_KEYWORDS)
4
4
5include_directories(
5include_directories(
6− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
7− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
8 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
6 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
9 ${CMAKE_SOURCE_DIR}/src
7 ${CMAKE_SOURCE_DIR}/src
10)
8)
11
9
10+include_directories(
11+ SYSTEM
12+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
13+ ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
14+)
15+
12set(UnityTestQML_SOURCES
16set(UnityTestQML_SOURCES
13 testutil.cpp
17 testutil.cpp
14 plugin.cpp
18 plugin.cpp