diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-09-20 13:39:56 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-09-22 10:30:24 +0000 |
commit | 7c713701bb302a27cb48b3fda8976e3b2602913f (patch) | |
tree | 007e9bf8c6950abae53779f74fac8174226acf16 /src | |
parent | 2586a62264610a55ae8d2894a6f9bee891a541f5 (diff) |
eglfs: make qeglfsglobal.h private
To avoid build system warnings about including _p headers.
There is no real reason to have this as a .h header anymore, now that
it is in the device integration private module.
Change-Id: I16526419356284e66861f95d1d0553abf0711218
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/eglfs/api/api.pri | 2 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfscontext.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfscontext_p.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfscursor_p.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsglobal_p.h (renamed from src/plugins/platforms/eglfs/api/qeglfsglobal.h) | 11 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfshooks_p.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsintegration_p.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsscreen_p.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfswindow_p.h | 2 |
11 files changed, 21 insertions, 10 deletions
diff --git a/src/plugins/platforms/eglfs/api/api.pri b/src/plugins/platforms/eglfs/api/api.pri index bd792dae7f..0ea65bd1ff 100644 --- a/src/plugins/platforms/eglfs/api/api.pri +++ b/src/plugins/platforms/eglfs/api/api.pri @@ -16,6 +16,6 @@ HEADERS += $$PWD/qeglfswindow_p.h \ $$PWD/qeglfsintegration_p.h \ $$PWD/qeglfscontext_p.h \ $$PWD/qeglfsoffscreenwindow_p.h \ - $$PWD/qeglfsglobal.h + $$PWD/qeglfsglobal_p.h INCLUDEPATH += $$PWD diff --git a/src/plugins/platforms/eglfs/api/qeglfscontext.cpp b/src/plugins/platforms/eglfs/api/qeglfscontext.cpp index 8e44b3e93e..1a33215295 100644 --- a/src/plugins/platforms/eglfs/api/qeglfscontext.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfscontext.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qeglfsglobal.h" +#include "qeglfsglobal_p.h" #include <QtGui/QSurface> #include <QtPlatformSupport/private/qeglconvenience_p.h> #include <QtPlatformSupport/private/qeglpbuffer_p.h> diff --git a/src/plugins/platforms/eglfs/api/qeglfscontext_p.h b/src/plugins/platforms/eglfs/api/qeglfscontext_p.h index 2274e488ff..65af3a7cee 100644 --- a/src/plugins/platforms/eglfs/api/qeglfscontext_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfscontext_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qeglfsglobal.h" +#include "qeglfsglobal_p.h" #include <QtPlatformSupport/private/qeglplatformcontext_p.h> #include <QtCore/QVariant> diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h index 8ccbe4493c..bf6dbc8a21 100644 --- a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qeglfsglobal.h" +#include "qeglfsglobal_p.h" #include <qpa/qplatformcursor.h> #include <qpa/qplatformscreen.h> #include <QtGui/QMatrix4x4> diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h index 819e4818ab..4335554912 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qeglfsglobal.h" +#include "qeglfsglobal_p.h" #include <qpa/qplatformintegration.h> #include <qpa/qplatformscreen.h> #include <QtCore/QString> diff --git a/src/plugins/platforms/eglfs/api/qeglfsglobal.h b/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h index 655ab7eaef..bad5095d21 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsglobal.h +++ b/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h @@ -40,6 +40,17 @@ #ifndef QEGLFSGLOBAL_H #define QEGLFSGLOBAL_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/qglobal.h> #include <QtPlatformSupport/private/qt_egl_p.h> diff --git a/src/plugins/platforms/eglfs/api/qeglfshooks_p.h b/src/plugins/platforms/eglfs/api/qeglfshooks_p.h index e379f7a76d..4c3149c7c9 100644 --- a/src/plugins/platforms/eglfs/api/qeglfshooks_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfshooks_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qeglfsglobal.h" +#include "qeglfsglobal_p.h" #include "qeglfsdeviceintegration_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h index 861a11e578..1a3a44d441 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qeglfsglobal.h" +#include "qeglfsglobal_p.h" #include <QtCore/QVariant> #include <qpa/qplatformintegration.h> #include <qpa/qplatformnativeinterface.h> diff --git a/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h b/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h index da9d9b0fd6..ec483c64e2 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qeglfsglobal.h" +#include "qeglfsglobal_p.h" #include <qpa/qplatformoffscreensurface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h b/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h index daba9fc591..131e619e06 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qeglfsglobal.h" +#include "qeglfsglobal_p.h" #include <QtCore/QPointer> #include <qpa/qplatformscreen.h> diff --git a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h index dd1d2d6fc7..6e752b8f79 100644 --- a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qeglfsglobal.h" +#include "qeglfsglobal_p.h" #include "qeglfsintegration_p.h" #include "qeglfsscreen_p.h" |