summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-10-07 15:03:35 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-10-08 09:52:19 +0300
commit0d102fc3030e3c96144261a57a5e03c050cdf97c (patch)
treef7f3b8ebe1633dff2d22aa8ed2e49937d05d5685
parentaab6b4f77d408c523bd9335ffa48bcc552c00c62 (diff)
Fix minor issues found in testing
Change-Id: If40f10043951409b3d6597776b60d7eb55c73eec Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--examples/datavisualization/volumetric/volumetric.cpp2
-rw-r--r--src/datavisualization/utils/texturehelper.cpp3
-rw-r--r--tests/barstest/main.cpp2
3 files changed, 5 insertions, 2 deletions
diff --git a/examples/datavisualization/volumetric/volumetric.cpp b/examples/datavisualization/volumetric/volumetric.cpp
index ade74fb2..788ada7a 100644
--- a/examples/datavisualization/volumetric/volumetric.cpp
+++ b/examples/datavisualization/volumetric/volumetric.cpp
@@ -42,7 +42,7 @@ const int mineShaftDiameter(1);
const int airColorIndex(254);
const int mineShaftColorIndex(255);
const int layerColorThickness(60);
-const int heightToColorDiv(128);
+const int heightToColorDiv(140);
const int magmaColorsMin(0);
const int magmaColorsMax(layerColorThickness);
const int aboveWaterGroundColorsMin(magmaColorsMax + 1);
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index 9dbf0613..1d8de71d 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -45,6 +45,9 @@ TextureHelper::TextureHelper()
TextureHelper::~TextureHelper()
{
+#if !defined(QT_OPENGL_ES_2)
+ delete m_openGlFunctions_2_1;
+#endif
}
GLuint TextureHelper::create2DTexture(const QImage &image, bool useTrilinearFiltering,
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp
index a468cb57..9a791c5b 100644
--- a/tests/barstest/main.cpp
+++ b/tests/barstest/main.cpp
@@ -236,7 +236,7 @@ int main(int argc, char **argv)
QCheckBox *inputHandlerZoomAtTargetCheckBox = new QCheckBox(widget);
inputHandlerZoomAtTargetCheckBox->setText("IH: setZoomAtTarget");
- inputHandlerZoomAtTargetCheckBox->setChecked(false);
+ inputHandlerZoomAtTargetCheckBox->setChecked(true);
QSlider *rotationSliderX = new QSlider(Qt::Horizontal, widget);
rotationSliderX->setTickInterval(1);