diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-12 09:53:52 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-12 10:31:27 +0300 |
| commit | 7f8966b035c9fd73d2cde04521c92892feefc0f9 (patch) | |
| tree | 55fee47c70805ff6bd4df1a8cd7693ea34132b27 /src/datavisualization/input | |
| parent | 1262c6562d7264c9fe4caf2f433615348c0f2ef8 (diff) | |
Fix Q3DScene caching
Task-number: QTRD-2258
Change-Id: Ifce23dca40566e75398e00975e8b2159b325739e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'src/datavisualization/input')
7 files changed, 17 insertions, 14 deletions
diff --git a/src/datavisualization/input/input.pri b/src/datavisualization/input/input.pri index 8305604b..b308a7e0 100644 --- a/src/datavisualization/input/input.pri +++ b/src/datavisualization/input/input.pri @@ -1,11 +1,11 @@ HEADERS += \ $$PWD/qabstract3dinputhandler.h \ $$PWD/q3dinputhandler.h \ - input/qtouch3dinputhandler.h \ - input/qabstract3dinputhandler_p.h \ - input/q3dinputhandler_p.h + $$PWD/qtouch3dinputhandler.h \ + $$PWD/qabstract3dinputhandler_p.h \ + $$PWD/q3dinputhandler_p.h SOURCES += \ $$PWD/qabstract3dinputhandler.cpp \ $$PWD/q3dinputhandler.cpp \ - input/qtouch3dinputhandler.cpp + $$PWD/qtouch3dinputhandler.cpp diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 85583a16..f721a375 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -15,6 +15,8 @@ ** contact form at http://qt.digia.com ** ****************************************************************************/ + +#include "datavisualizationglobal_p.h" #include "q3dinputhandler.h" #include "q3dcamera.h" #include "q3dlight.h" diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index 2bab02d6..d87966d6 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -19,6 +19,10 @@ #ifndef QDEFAULT3DINPUTHANDLER_H #define QDEFAULT3DINPUTHANDLER_H +#include <QtDataVisualization/qabstract3dinputhandler.h> + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + const int minZoomLevel = 10; const int halfSizeZoomLevel = 50; const int oneToOneZoomLevel = 100; @@ -30,10 +34,6 @@ const int farZoomRangeDivider = 120; const float rotationSpeed = 100.0f; -#include "qabstract3dinputhandler.h" - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - class QT_DATAVISUALIZATION_EXPORT Q3DInputHandler : public QAbstract3DInputHandler { Q_OBJECT diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index 36125582..367669c0 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -15,7 +15,7 @@ ** contact form at http://qt.digia.com ** ****************************************************************************/ -#include "qabstract3dinputhandler.h" +#include "qabstract3dinputhandler_p.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 36f4ea21..d19f626d 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -19,14 +19,14 @@ #ifndef QABSTRACT3DINPUTHANDLER_H #define QABSTRACT3DINPUTHANDLER_H -#include "qdatavisualizationenums.h" -#include "qabstract3dinputhandler_p.h" -#include "q3dscene.h" -#include <QObject> +#include <QtDataVisualization/qdatavisualizationenums.h> +#include <QtDataVisualization/q3dscene.h> #include <QMouseEvent> QT_DATAVISUALIZATION_BEGIN_NAMESPACE +class QAbstract3DInputHandlerPrivate; + class QT_DATAVISUALIZATION_EXPORT QAbstract3DInputHandler : public QObject { Q_OBJECT diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h index 0ec6cfe9..cad1c667 100644 --- a/src/datavisualization/input/qabstract3dinputhandler_p.h +++ b/src/datavisualization/input/qabstract3dinputhandler_p.h @@ -30,6 +30,7 @@ #define QABSTRACT3DINPUTHANDLER_P_H #include "datavisualizationglobal_p.h" +#include "qabstract3dinputhandler.h" #include <QRect> QT_DATAVISUALIZATION_BEGIN_NAMESPACE diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h index b915ff2a..4d5edefc 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.h +++ b/src/datavisualization/input/qtouch3dinputhandler.h @@ -19,7 +19,7 @@ #ifndef QTOUCH3DINPUTHANDLER_H #define QTOUCH3DINPUTHANDLER_H -#include "q3dinputhandler.h" +#include <QtDataVisualization/q3dinputhandler.h> QT_DATAVISUALIZATION_BEGIN_NAMESPACE |