diff options
-rw-r--r-- | dist/changes-5.9.0 | 17 | ||||
-rw-r--r-- | src/datavisualization/doc/qtdatavis3d.qdocconf | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller_p.h | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/qabstract3dgraph.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/qabstract3dgraph.h | 2 | ||||
-rw-r--r-- | src/datavisualization/input/q3dinputhandler.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/input/q3dinputhandler.h | 2 | ||||
-rw-r--r-- | src/datavisualization/input/qabstract3dinputhandler.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/input/qabstract3dinputhandler.h | 2 | ||||
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 2 | ||||
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 2 | ||||
-rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2_plugin.h | 8 | ||||
-rw-r--r-- | src/datavisualizationqml2/declarativetheme.cpp | 2 | ||||
-rw-r--r-- | tests/auto/auto.pro | 3 | ||||
-rw-r--r-- | tests/auto/cpptest/cpptest.pro | 11 |
16 files changed, 62 insertions, 1 deletions
diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0 index 85dfb543..9fdfac47 100644 --- a/dist/changes-5.9.0 +++ b/dist/changes-5.9.0 @@ -1,3 +1,20 @@ +Qt 5.9 introduces many new features and improvements as well as bugfixes +over the 5.8.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + Qt Data Visualization 5.9.0 Fixed issues diff --git a/src/datavisualization/doc/qtdatavis3d.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf index 7d89c76a..63aa334d 100644 --- a/src/datavisualization/doc/qtdatavis3d.qdocconf +++ b/src/datavisualization/doc/qtdatavis3d.qdocconf @@ -48,3 +48,5 @@ qhp.QtDataVisualization.subprojects.types.sortPages = true navigation.landingpage = Qt Data Visualization navigation.cppclassespage = Qt Data Visualization C++ Classes navigation.qmltypespage = Qt Data Visualization QML Types + +manifestmeta.highlighted.names += "QtDataVisualization/Bars Example" diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index adfe461e..02a435aa 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -589,11 +589,13 @@ void Abstract3DController::mouseMoveEvent(QMouseEvent *event, const QPoint &mous m_activeInputHandler->mouseMoveEvent(event, mousePos); } +#if QT_CONFIG(wheelevent) void Abstract3DController::wheelEvent(QWheelEvent *event) { if (m_activeInputHandler) m_activeInputHandler->wheelEvent(event); } +#endif void Abstract3DController::handleThemeColorStyleChanged(Q3DTheme::ColorStyle style) { diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index 4f65d427..56b7a45e 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -338,7 +338,9 @@ public: virtual void mousePressEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); +#if QT_CONFIG(wheelevent) virtual void wheelEvent(QWheelEvent *event); +#endif virtual void handleAxisTitleChangedBySender(QObject *sender); virtual void handleAxisLabelsChangedBySender(QObject *sender); diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index dfedacd0..cb09082e 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -1029,6 +1029,7 @@ void QAbstract3DGraph::mouseMoveEvent(QMouseEvent *event) d_ptr->m_visualController->mouseMoveEvent(event, event->pos()); } +#if QT_CONFIG(wheelevent) /*! * \internal */ @@ -1036,6 +1037,7 @@ void QAbstract3DGraph::wheelEvent(QWheelEvent *event) { d_ptr->m_visualController->wheelEvent(event); } +#endif QAbstract3DGraphPrivate::QAbstract3DGraphPrivate(QAbstract3DGraph *q) : QObject(0), diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h index 87c93f5f..a7d7d2ac 100644 --- a/src/datavisualization/engine/qabstract3dgraph.h +++ b/src/datavisualization/engine/qabstract3dgraph.h @@ -206,7 +206,9 @@ protected: void mousePressEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event); +#endif Q_SIGNALS: void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler); diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 85934482..5e6f10af 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -236,6 +236,7 @@ void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) #endif } +#if QT_CONFIG(wheelevent) /*! * Override this to change handling of wheel events. * The wheel event is given in the \a event. @@ -272,6 +273,7 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event) } } } +#endif /*! * \property Q3DInputHandler::rotationEnabled diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index f2028cd1..d606360b 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -61,7 +61,9 @@ public: virtual void mousePressEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); +#if QT_CONFIG(wheelevent) virtual void wheelEvent(QWheelEvent *event); +#endif Q_SIGNALS: void rotationEnabledChanged(bool enable); diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index d0ab00a1..2809bee3 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -135,6 +135,7 @@ void QAbstract3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &m Q_UNUSED(mousePos); } +#if QT_CONFIG(wheelevent) /*! * Override this to handle wheel events. * Wheel event is given in the \a event. @@ -143,6 +144,7 @@ void QAbstract3DInputHandler::wheelEvent(QWheelEvent *event) { Q_UNUSED(event); } +#endif // Property get/set /*! diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 753a34fa..c54138e3 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -68,7 +68,9 @@ public: virtual void mousePressEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); +#if QT_CONFIG(wheelevent) virtual void wheelEvent(QWheelEvent *event); +#endif InputView inputView() const; void setInputView(InputView inputView); diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 7568fd30..9c7a7238 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -656,10 +656,12 @@ void AbstractDeclarative::mouseMoveEvent(QMouseEvent *event) m_controller->mouseMoveEvent(event, mousePos); } +#if QT_CONFIG(wheelevent) void AbstractDeclarative::wheelEvent(QWheelEvent *event) { m_controller->wheelEvent(event); } +#endif void AbstractDeclarative::checkWindowList(QQuickWindow *window) { diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 1a9c4e81..f49da398 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -250,7 +250,9 @@ protected: virtual void mousePressEvent(QMouseEvent *event); virtual void mouseReleaseEvent(QMouseEvent *event); virtual void mouseMoveEvent(QMouseEvent *event); +#if QT_CONFIG(wheelevent) virtual void wheelEvent(QWheelEvent *event); +#endif virtual void handleWindowChanged(QQuickWindow *win); virtual void itemChange(ItemChange change, const ItemChangeData &value); virtual void updateWindowParameters(); diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index eb2f965b..77b5f1cf 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -117,6 +117,13 @@ QML_DECLARE_TYPE(QCustom3DItem) QML_DECLARE_TYPE(QCustom3DLabel) QML_DECLARE_TYPE(QCustom3DVolume) +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtDataVisualization); +#endif +} + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin @@ -125,6 +132,7 @@ class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: + QtDataVisualizationQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri); }; diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp index e0e94494..1e44de0a 100644 --- a/src/datavisualizationqml2/declarativetheme.cpp +++ b/src/datavisualizationqml2/declarativetheme.cpp @@ -201,8 +201,8 @@ void DeclarativeTheme3D::setThemeGradient(ColorGradient *gradient, GradientType Q3DTheme::setSingleHighlightGradient(newGradient); break; case GradientTypeMultiHL: - break; Q3DTheme::setMultiHighlightGradient(newGradient); + break; default: qWarning("Incorrect usage. Type may be GradientTypeSingleHL or GradientTypeMultiHL."); break; diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 70ffea39..ec2dc3ba 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -5,3 +5,6 @@ TEMPLATE = subdirs qtHaveModule(quick): SUBDIRS += qmltest installed_cmake.depends = cmake + +# QTBUG-60268 +boot2qt: SUBDIRS -= qmltest diff --git a/tests/auto/cpptest/cpptest.pro b/tests/auto/cpptest/cpptest.pro index abd8f38e..ac91d813 100644 --- a/tests/auto/cpptest/cpptest.pro +++ b/tests/auto/cpptest/cpptest.pro @@ -24,3 +24,14 @@ SUBDIRS = q3dbars \ q3dcustom \ q3dcustom-label \ q3dcustom-volume + +# QTBUG-60268 +boot2qt { + SUBDIRS -= q3dbars \ + q3dcustom-label \ + q3dsurface-modelproxy \ + q3dbars-modelproxy \ + q3dscene \ + q3dscatter \ + q3dsurface +} |