diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-29 16:58:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-04 20:21:09 +0000 |
| commit | 72fe67353de5a49bcc68efc6958bc3395c55ab78 (patch) | |
| tree | 3635071c4b384973604999e0175a12c4803ce5c8 /src | |
| parent | db732a07c0f7ac1da79c64f6133902b97694b9ef (diff) | |
rely on module include paths for qpa includes
Change-Id: I9a28a5ec9b0050786c4abc39c6ac298e95cf8fad
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/dbusmenu/dbusmenu.pri | 2 | ||||
| -rw-r--r-- | src/platformsupport/dbustray/dbustray.pri | 2 | ||||
| -rw-r--r-- | src/platformsupport/dbustray/qdbustrayicon.cpp | 6 | ||||
| -rw-r--r-- | src/platformsupport/linuxaccessibility/dbusconnection.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/platformsupport/dbusmenu/dbusmenu.pri b/src/platformsupport/dbusmenu/dbusmenu.pri index 2d0feca1a2..662ebfdae6 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 734ee5fb40..f703e24ba9 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 0369eaf144..36939b467e 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 a3c2ecc084..3e2248a018 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 |