File qdbusmenu-rely-on-module-include-paths-for-qpa-... of Package libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File qdbusmenu-rely-on-module-include-paths-for-qpa-includes.patch of Package libqt5-qtbase

From 72fe67353de5a49bcc68efc6958bc3395c55ab78 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 29 Sep 2016 16:58:37 +0200
Subject: [PATCH] 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>
---
 src/platformsupport/dbusmenu/dbusmenu.pri                 | 2 +-
 src/platformsupport/dbustray/dbustray.pri                 | 2 +-
 src/platformsupport/dbustray/qdbustrayicon.cpp            | 6 +++---
 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 2d0feca..662ebfd 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 734ee5f..f703e24 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 0369eaf..36939b4 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 a3c2ecc..3e2248a 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
 
-- 
2.10.2

Places

File qdbusmenu-rely-on-module-include-paths-for-qpa-includes.patch of Package libqt5-qtbase

Places