diff options
| author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-10-30 11:56:28 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-10-30 10:01:22 +0000 |
| commit | 0dbded1506abf172b7b3cf7685bdcb30c7b8012d (patch) | |
| tree | a0cdb79e6a482697cc96c3300b0502595b42d4b1 /src/input | |
| parent | 9b9f34701f47824e8201453d148152fb0855f98a (diff) | |
d-pointer classes, private/public changes
Change-Id: I4ca133aebad0c088296ab293f95f0a6d76d18395
Task-number: QTBUG-39946
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/handle_types_p.h | 2 | ||||
| -rw-r--r-- | src/input/input.pri | 4 | ||||
| -rw-r--r-- | src/input/inputhandler.cpp | 2 | ||||
| -rw-r--r-- | src/input/mouseeventfilter.cpp | 2 | ||||
| -rw-r--r-- | src/input/mouseeventfilter_p.h (renamed from src/input/mouseeventfilter.h) | 11 |
5 files changed, 16 insertions, 5 deletions
diff --git a/src/input/handle_types_p.h b/src/input/handle_types_p.h index e478405d4..dfa26b53b 100644 --- a/src/input/handle_types_p.h +++ b/src/input/handle_types_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qhandle_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/input.pri b/src/input/input.pri index 93c031947..0c0a62d8b 100644 --- a/src/input/input.pri +++ b/src/input/input.pri @@ -22,8 +22,8 @@ HEADERS += \ $$PWD/q3dmouseevent.h \ $$PWD/mousecontroller_p.h \ $$PWD/mouseinput_p.h \ - $$PWD/mouseeventfilter.h \ - $$PWD/mouseeventdispatcherjob_p.h + $$PWD/mouseeventdispatcherjob_p.h \ + $$PWD/mouseeventfilter_p.h SOURCES += \ $$PWD/cameracontroller.cpp \ diff --git a/src/input/inputhandler.cpp b/src/input/inputhandler.cpp index 13d32b956..1fd778501 100644 --- a/src/input/inputhandler.cpp +++ b/src/input/inputhandler.cpp @@ -37,7 +37,7 @@ #include "inputhandler_p.h" #include "inputmanagers_p.h" #include "keyboardeventfilter_p.h" -#include "mouseeventfilter.h" +#include "mouseeventfilter_p.h" #include "assignkeyboardfocusjob_p.h" #include "keyeventdispatcherjob_p.h" #include "mouseeventdispatcherjob_p.h" diff --git a/src/input/mouseeventfilter.cpp b/src/input/mouseeventfilter.cpp index 7fa245ec0..fcf8eb922 100644 --- a/src/input/mouseeventfilter.cpp +++ b/src/input/mouseeventfilter.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "mouseeventfilter.h" +#include "mouseeventfilter_p.h" #include "inputhandler_p.h" #include <QEvent> #include <QKeyEvent> diff --git a/src/input/mouseeventfilter.h b/src/input/mouseeventfilter_p.h index 38c82ff96..6fba946b8 100644 --- a/src/input/mouseeventfilter.h +++ b/src/input/mouseeventfilter_p.h @@ -37,6 +37,17 @@ #ifndef QT3DINPUT_INPUT_MOUSEEVENTFILTER_P_H #define QT3DINPUT_INPUT_MOUSEEVENTFILTER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> QT_BEGIN_NAMESPACE |