diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:56:05 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:56:05 +0100 |
| commit | f750a084bec3062b1531e299e880043cfa19d6e7 (patch) | |
| tree | f278ecfb6b550c0e7046e3d1d2f9787e0d81c3ff | |
| parent | f03ed59a582d2bf689c866f195224bf659a7bc47 (diff) | |
| parent | beb420e3995010b5729608922022e65558f58764 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I10b221188c4306563f3b150f048d5f99aefc9fb1
| -rw-r--r-- | src/datavisualization/data/qbardataproxy.cpp | 6 | ||||
| -rw-r--r-- | src/datavisualization/datavisualization.pro | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 110275fd..e435417b 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -738,9 +738,9 @@ QPair<GLfloat, GLfloat> QBarDataProxyPrivate::limitValues(int startRow, int endR for (int i = startRow; i <= endRow; i++) { QBarDataRow *row = m_dataArray->at(i); if (row) { - endColumn = qMin(endColumn, row->size() - 1); - for (int j = startColumn; j <= endColumn; j++) { - const QBarDataItem &item = m_dataArray->at(i)->at(j); + int lastColumn = qMin(endColumn, row->size() - 1); + for (int j = startColumn; j <= lastColumn; j++) { + const QBarDataItem &item = row->at(j); float itemValue = item.value(); if (limits.second < itemValue) limits.second = itemValue; diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index e85a1e47..41d0f54b 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -3,8 +3,6 @@ TARGET = QtDataVisualization QT += core gui osx: QT += gui-private -MODULE_INCNAME = QtDataVisualization - QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)" diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 212b9fa6..848dc0f7 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -2442,7 +2442,7 @@ void Surface3DRenderer::createSelectionTexture(SurfaceSeriesRenderCache *cache, int idImageHeight = (sampleSpace.height() - 1) * 2; if (idImageHeight <= 0 || idImageWidth <= 0) { - cache->setSelectionIdRange(-1, -1); + cache->setSelectionIdRange(~0U, ~0U); cache->setSelectionTexture(0); return; } |