diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-06-15 15:42:10 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-14 06:06:43 +0000 |
| commit | 24f770ba2431985c9c6471855b2757b42149e3e8 (patch) | |
| tree | e39e1bb2ba4762b7681993d9e14acec9a8332fad /src/dbus/qdbusmetaobject_p.h | |
| parent | 7682542b4b487003e43c4081be01c06655db3c7e (diff) | |
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>
Diffstat (limited to 'src/dbus/qdbusmetaobject_p.h')
| -rw-r--r-- | src/dbus/qdbusmetaobject_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 |