From 24f770ba2431985c9c6471855b2757b42149e3e8 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 15 Jun 2016 15:42:10 +0200
Subject: Add qtdbusglobal.h and qtdbusglobal_p.h

The new modular configuration system requires one global
header per module, that is included by all other files in
this module.

QtDBus already had such a header, but its name (qdbusmacros.h) was
not in line with what's being used in all other modules. So
add a qtdbusglobal.h header, and turn qdbusmacros.h into a a forwarding
header to that new global header file.

Change-Id: Ib7eb2484c7b8b588eb89bf3290cb6c1c7c391fe2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/dbus/qdbusmetaobject_p.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/dbus/qdbusmetaobject_p.h')

diff --git a/src/dbus/qdbusmetaobject_p.h b/src/dbus/qdbusmetaobject_p.h
index c785849826..599358634b 100644
--- a/src/dbus/qdbusmetaobject_p.h
+++ b/src/dbus/qdbusmetaobject_p.h
@@ -37,6 +37,9 @@
 **
 ****************************************************************************/
 
+#ifndef QDBUSMETAOBJECT_P_H
+#define QDBUSMETAOBJECT_P_H
+
 //
 //  W A R N I N G
 //  -------------
@@ -49,11 +52,8 @@
 //
 //
 
-#ifndef QDBUSMETAOBJECT_P_H
-#define QDBUSMETAOBJECT_P_H
-
+#include <QtDBus/private/qtdbusglobal_p.h>
 #include <QtCore/qmetaobject.h>
-#include <qdbusmacros.h>
 
 #ifndef QT_NO_DBUS
 
-- 
cgit v1.2.3