summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <[email protected]>2016-09-29 16:58:37 +0200
committerOswald Buddenhagen <[email protected]>2016-10-04 20:21:09 +0000
commit72fe67353de5a49bcc68efc6958bc3395c55ab78 (patch)
tree3635071c4b384973604999e0175a12c4803ce5c8
parentdb732a07c0f7ac1da79c64f6133902b97694b9ef (diff)
rely on module include paths for qpa includes
Change-Id: I9a28a5ec9b0050786c4abc39c6ac298e95cf8fad Reviewed-by: Jake Petroules <[email protected]> Reviewed-by: Frederik Gladhorn <[email protected]>
-rw-r--r--src/platformsupport/dbusmenu/dbusmenu.pri2
-rw-r--r--src/platformsupport/dbustray/dbustray.pri2
-rw-r--r--src/platformsupport/dbustray/qdbustrayicon.cpp6
-rw-r--r--src/platformsupport/linuxaccessibility/dbusconnection.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/platformsupport/dbusmenu/dbusmenu.pri b/src/platformsupport/dbusmenu/dbusmenu.pri
index 2d0feca1a29..662ebfdae67 100644
--- a/src/platformsupport/dbusmenu/dbusmenu.pri
+++ b/src/platformsupport/dbusmenu/dbusmenu.pri
@@ -1,6 +1,6 @@
QT_FOR_PRIVATE += dbus
-INCLUDEPATH += $$PWD $$PWD/../../gui/kernel
+INCLUDEPATH += $$PWD
HEADERS += \
$$PWD/qdbusmenuadaptor_p.h \
diff --git a/src/platformsupport/dbustray/dbustray.pri b/src/platformsupport/dbustray/dbustray.pri
index 734ee5fb40b..f703e24ba94 100644
--- a/src/platformsupport/dbustray/dbustray.pri
+++ b/src/platformsupport/dbustray/dbustray.pri
@@ -1,6 +1,6 @@
QT_FOR_PRIVATE += dbus
-INCLUDEPATH += $$PWD $$PWD/../../gui/kernel
+INCLUDEPATH += $$PWD
HEADERS += \
$$PWD/qdbustrayicon_p.h \
diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/dbustray/qdbustrayicon.cpp
index 0369eaf144e..36939b467e1 100644
--- a/src/platformsupport/dbustray/qdbustrayicon.cpp
+++ b/src/platformsupport/dbustray/qdbustrayicon.cpp
@@ -47,13 +47,13 @@
#include "dbusmenu/qdbusplatformmenu_p.h"
#include "qxdgnotificationproxy_p.h"
-#include <qplatformmenu.h>
+#include <qpa/qplatformmenu.h>
#include <qstring.h>
#include <qdebug.h>
#include <qrect.h>
#include <qloggingcategory.h>
-#include <qplatformintegration.h>
-#include <qplatformservices.h>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformservices.h>
#include <qdbusconnectioninterface.h>
#include <private/qlockfile_p.h>
#include <private/qguiapplication_p.h>
diff --git a/src/platformsupport/linuxaccessibility/dbusconnection.cpp b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
index a3c2ecc0844..3e2248a0187 100644
--- a/src/platformsupport/linuxaccessibility/dbusconnection.cpp
+++ b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
@@ -49,7 +49,7 @@
#include "bus_interface.h"
#include <QtGui/qguiapplication.h>
-#include <qplatformnativeinterface.h>
+#include <qpa/qplatformnativeinterface.h>
QT_BEGIN_NAMESPACE