diff options
6 files changed, 7 insertions, 10 deletions
diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index 40ebd962..f466b2b0 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qmloscilloscope/datasource.cpp @@ -23,7 +23,6 @@ using namespace QtDataVisualization; //! [3] Q_DECLARE_METATYPE(QSurface3DSeries *) -Q_DECLARE_METATYPE(QValue3DAxis *) //! [3] DataSource::DataSource(QObject *parent) : @@ -33,7 +32,6 @@ DataSource::DataSource(QObject *parent) : { //! [4] qRegisterMetaType<QSurface3DSeries *>(); - qRegisterMetaType<QValue3DAxis *>(); //! [4] } diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h index 76ba7c9c..483523e0 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.h +++ b/examples/datavisualization/qmloscilloscope/datasource.h @@ -20,7 +20,6 @@ #define DATASOURCE_H #include <QtDataVisualization/QSurface3DSeries> -#include <QtDataVisualization/QValue3DAxis> using namespace QtDataVisualization; diff --git a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc index 93bd5c30..e13320c3 100644 --- a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc +++ b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc @@ -64,9 +64,9 @@ \snippet qmloscilloscope/main.cpp 0 - To make it possible to use Qt Data Visualization class pointers as parameters on the + To make it possible to use QSurface3DSeries pointers as parameters on the \c DataSource class methods on all environments and builds, we need to make sure the meta - types are registered: + type is registered: \snippet qmloscilloscope/datasource.cpp 3 \dots 0 diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index c7856834..f65ec634 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -1126,9 +1126,6 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) } } - glEnable(GL_CULL_FACE); - glCullFace(GL_FRONT); - Abstract3DRenderer::drawCustomItems(RenderingDepth, m_depthShader, viewMatrix, projectionViewMatrix, depthProjectionViewMatrix, m_depthTexture, m_shadowQualityToShader); diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index cb7d576b..c063ae58 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -230,7 +230,8 @@ QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputH m_previousInputPos(QPoint(0,0)), m_inputView(QAbstract3DInputHandler::InputViewNone), m_inputPosition(QPoint(0,0)), - m_scene(0) + m_scene(0), + m_isDefaultHandler(false) { } diff --git a/tests/itemmodeltest/main.cpp b/tests/itemmodeltest/main.cpp index 38454948..b2231594 100644 --- a/tests/itemmodeltest/main.cpp +++ b/tests/itemmodeltest/main.cpp @@ -226,8 +226,10 @@ void GraphDataGenerator::changeSelectedButtonClicked() QVariant value = QVariant::fromValue(float((rand() % 10) + 1)); QList<QTableWidgetItem *> selectedItems = m_tableWidget->selectedItems(); foreach (QTableWidgetItem *item, selectedItems) { + QString oldData = item->data(Qt::DisplayRole).toString(); item->setData(Qt::DisplayRole, - QString::number(value.toReal()) + oldData.left(5) + .append(QString::number(value.toReal())) .append("/") .append(QString::number(value.toReal() * 10))); } |