8c79053 · unity8 · git.iko.soy

plugins/Cursor/CMakeLists.txt+4

compare with xenial

unifiedsplit

@@ -3,6 +3,10 @@ add_subdirectory(3rd_party)

3include_directories(

4 ${CMAKE_CURRENT_SOURCE_DIR}

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+4

@@ -10,6 +10,10 @@ endif()

10include_directories(

11 ${CMAKE_CURRENT_SOURCE_DIR}

12 ${CMAKE_CURRENT_BINARY_DIR}

13+)

14+

15+include_directories(

16+ SYSTEM

13 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

17 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

14 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

18 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

15 ${Qt5V8_PRIVATE_INCLUDE_DIR}

19 ${Qt5V8_PRIVATE_INCLUDE_DIR}

plugins/Dash/abstractdashview.h+1−3

@@ -21,11 +21,9 @@

21

22class QAbstractItemModel;

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+1−4

@@ -26,12 +26,9 @@

26#include "horizontaljournal.h"

27

28#include <qqmlengine.h>

29−#pragma GCC diagnostic push

30−#pragma GCC diagnostic ignored "-pedantic"

31−#include <private/qqmldelegatemodel_p.h>

32#include <qqmlinfo.h>

29#include <qqmlinfo.h>

30+#include <private/qqmldelegatemodel_p.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,14 +95,11 @@

95#include <QDebug>

96#include <qqmlinfo.h>

97#include <qqmlengine.h>

98−#pragma GCC diagnostic push

99−#pragma GCC diagnostic ignored "-pedantic"

100#include <private/qqmlcontext_p.h>

98#include <private/qqmlcontext_p.h>

101#include <private/qqmldelegatemodel_p.h>

99#include <private/qqmldelegatemodel_p.h>

102#include <private/qqmlglobal_p.h>

100#include <private/qqmlglobal_p.h>

103#include <private/qquickitem_p.h>

101#include <private/qquickitem_p.h>

104#include <private/qquickanimation_p.h>

102#include <private/qquickanimation_p.h>

105−#pragma GCC diagnostic pop

106// #include <private/qquickrectangle_p.h>

103// #include <private/qquickrectangle_p.h>

107

104

108qreal ListViewWithPageHeader::ListItem::height() const

105qreal ListViewWithPageHeader::ListItem::height() const

plugins/Dash/organicgrid.cpp−3

@@ -16,10 +16,7 @@

16

17#include "organicgrid.h"

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 */

28#include "verticaljournal.h"

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)

3

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 *

16 */

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(

2 ${CMAKE_CURRENT_SOURCE_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+5−1

@@ -24,7 +24,10 @@ qt5_use_modules(UbuntuGesturesQml Core Quick)

24# So that Foo.cpp can #include "Foo.moc"

25include_directories(${CMAKE_CURRENT_BINARY_DIR})

26

27+include_directories(

28+ SYSTEM

27−include_directories(${UBUNTUGESTURES_INCLUDE_DIRS})

29+ ${UBUNTUGESTURES_INCLUDE_DIRS}

30+)

28

31

29# There's no cmake var for v8 include path :-/ so create one

32# There's no cmake var for v8 include path :-/ so create one

30LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)

33LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)

@@ -32,6 +35,7 @@ SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)

32

35

33# DANGER! DANGER! Using Qt's private API!

36# DANGER! DANGER! Using Qt's private API!

34include_directories(

37include_directories(

38+ SYSTEM

35 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

39 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

36 ${Qt5Quick_INCLUDE_DIRS}

40 ${Qt5Quick_INCLUDE_DIRS}

37 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

41 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

plugins/Ubuntu/Gestures/TouchDispatcher.cpp−4

@@ -19,11 +19,7 @@

19#include <QGuiApplication>

20#include <QScopedPointer>

21#include <QStyleHints>

22−

23−#pragma GCC diagnostic push

24−#pragma GCC diagnostic ignored "-pedantic"

25#include <private/qquickitem_p.h>

22#include <private/qquickitem_p.h>

26−#pragma GCC diagnostic pop

27

23

28#define TOUCHDISPATCHER_DEBUG 0

24#define TOUCHDISPATCHER_DEBUG 0

29

25

plugins/Unity/Indicators/CMakeLists.txt+4

@@ -6,6 +6,10 @@ find_package(Qt5Quick REQUIRED)

6include_directories(

7 ${CMAKE_CURRENT_SOURCE_DIR}

8 ${CMAKE_CURRENT_BINARY_DIR}

9+)

10+

11+include_directories(

12+ SYSTEM

9 ${GLIB_INCLUDE_DIRS}

13 ${GLIB_INCLUDE_DIRS}

10 ${GIO_INCLUDE_DIRS}

14 ${GIO_INCLUDE_DIRS}

11 ${QMENUMODEL_INCLUDE_DIRS}

15 ${QMENUMODEL_INCLUDE_DIRS}

plugins/Utils/CMakeLists.txt+4

@@ -1,6 +1,10 @@

1include_directories(

2 ${CMAKE_CURRENT_SOURCE_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+1−4

@@ -16,11 +16,8 @@

16

17#include "globalfunctions.h"

18

19−#pragma GCC diagnostic push

20−#pragma GCC diagnostic ignored "-pedantic"

21−#include <private/qquickitem_p.h>

22−#pragma GCC diagnostic pop

23#include <QQmlEngine>

19#include <QQmlEngine>

20+#include <private/qquickitem_p.h>

24

21

25GlobalFunctions::GlobalFunctions(QObject *parent)

22GlobalFunctions::GlobalFunctions(QObject *parent)

26 : QObject(parent)

23 : QObject(parent)

src/CMakeLists.txt+1

@@ -1,6 +1,7 @@

1pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt1)

2

3include_directories(

4+ SYSTEM

4 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

5 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

5 ${CONNECTIVITY_INCLUDE_DIRS}

6 ${CONNECTIVITY_INCLUDE_DIRS}

6)

7)

tests/mocks/Utils/CMakeLists.txt+5−1

@@ -1,10 +1,14 @@

1include_directories(

2 ${CMAKE_CURRENT_SOURCE_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

10set(QMLPLUGIN_SRC

14set(QMLPLUGIN_SRC

tests/plugins/Dash/CMakeLists.txt+4

@@ -12,10 +12,14 @@ endif()

12

13

14include_directories(

15+ SYSTEM

15 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

16 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

16 ${Qt5Quick_INCLUDE_DIRS}

17 ${Qt5Quick_INCLUDE_DIRS}

17 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

18 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

18 ${Qt5V8_PRIVATE_INCLUDE_DIR}

19 ${Qt5V8_PRIVATE_INCLUDE_DIR}

20+ )

21+

22+include_directories(

19 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash

23 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash

20 ${CMAKE_CURRENT_BINARY_DIR}

24 ${CMAKE_CURRENT_BINARY_DIR}

21 )

25 )

tests/plugins/Dash/horizontaljournaltest.cpp−3

@@ -23,10 +23,7 @@

23#include <QStringListModel>

24#include <QQmlContext>

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>

23#include <QSortFilterProxyModel>

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>

22#include <QSignalSpy>

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>

22#include <QSignalSpy>

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>

24#include <QQmlContext>

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>

24#include <QQmlContext>

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+3−2

@@ -4,14 +4,15 @@ pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

4

5# DANGER! DANGER! Using Qt's private API!

6include_directories(

7+ SYSTEM

7 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

8 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

9+ ${UBUNTUGESTURES_INCLUDE_DIRS}

10+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

8)

11)

9

12

10include_directories(

13include_directories(

11 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures

14 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures

12− ${UBUNTUGESTURES_INCLUDE_DIRS}

13 ${CMAKE_CURRENT_BINARY_DIR}

15 ${CMAKE_CURRENT_BINARY_DIR}

14− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

15 )

16 )

16

17

17export_qmlfiles(UbuntuGesturesTest .)

18export_qmlfiles(UbuntuGesturesTest .)

tests/qmltests/Components/CMakeLists.txt+5−1

@@ -6,8 +6,12 @@ pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

6

7include_directories(

8 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures

9− ${UBUNTUGESTURES_INCLUDE_DIRS}

10 ${CMAKE_CURRENT_BINARY_DIR}

9 ${CMAKE_CURRENT_BINARY_DIR}

10+ )

11+

12+include_directories(

13+ SYSTEM

14+ ${UBUNTUGESTURES_INCLUDE_DIRS}

11 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

15 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

12 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

16 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

13 ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}

17 ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}

tests/utils/modules/Unity/Test/CMakeLists.txt+5−1

@@ -5,10 +5,14 @@ add_definitions(-DQT_NO_KEYWORDS)

5pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

6

7include_directories(

8+ ${CMAKE_SOURCE_DIR}/src

9+)

10+

11+include_directories(

12+ SYSTEM

8 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

13 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

9 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

14 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

10 ${UBUNTUGESTURES_INCLUDE_DIRS}

15 ${UBUNTUGESTURES_INCLUDE_DIRS}

11− ${CMAKE_SOURCE_DIR}/src

12)

16)

13

17

14set(UnityTestQML_SOURCES

18set(UnityTestQML_SOURCES