summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--src/datavisualization/engine/axisrendercache.cpp2
-rw-r--r--src/datavisualization/utils/utils.cpp4
-rw-r--r--tests/manual/volumetrictest/volumetrictest.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 450400ef..a8f1baef 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,5 @@
load(qt_build_config)
-MODULE_VERSION = 5.12.2
+MODULE_VERSION = 5.13.0
CONFIG += warning_clean
CMAKE_MODULE_TESTS=-
diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp
index 1c5913d1..06f6d9eb 100644
--- a/src/datavisualization/engine/axisrendercache.cpp
+++ b/src/datavisualization/engine/axisrendercache.cpp
@@ -201,7 +201,7 @@ int AxisRenderCache::maxLabelWidth(const QStringList &labels) const
labelFont.setPointSize(textureFontSize);
QFontMetrics labelFM(labelFont);
for (int i = 0; i < labels.size(); i++) {
- int newWidth = labelFM.width(labels.at(i));
+ int newWidth = labelFM.horizontalAdvance(labels.at(i));
if (labelWidth < newWidth)
labelWidth = newWidth;
}
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index f80cf45f..d5850d86 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -84,7 +84,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo
QFont valueFont = font;
valueFont.setPointSize(textureFontSize);
QFontMetrics valueFM(valueFont);
- int valueStrWidth = valueFM.width(text);
+ int valueStrWidth = valueFM.horizontalAdvance(text);
// ES2 needs to use maxLabelWidth always (when given) because of the power of 2 -issue.
if (maxLabelWidth && (labelBackground || Utils::isOpenGLES()))
@@ -136,7 +136,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo
if (maxLabelWidth && (labelBackground || Utils::isOpenGLES()))
valueStrWidth = maxLabelWidth * fontRatio;
else
- valueStrWidth = currentValueFM.width(text);
+ valueStrWidth = currentValueFM.horizontalAdvance(text);
valueStrHeight = currentValueFM.height();
valueStrWidth += paddingWidth / 2;
}
diff --git a/tests/manual/volumetrictest/volumetrictest.cpp b/tests/manual/volumetrictest/volumetrictest.cpp
index 09dae433..6b2a57a8 100644
--- a/tests/manual/volumetrictest/volumetrictest.cpp
+++ b/tests/manual/volumetrictest/volumetrictest.cpp
@@ -381,7 +381,7 @@ void VolumetricModifier::createVolume()
logo.load(QStringLiteral(":/logo_no_padding.png"));
//logo.load(QStringLiteral(":/logo.png"));
qDebug() << "image dimensions:" << logo.width() << logo.height()
- << logo.byteCount() << (logo.width() * logo.height())
+ << logo.sizeInBytes() << (logo.width() * logo.height())
<< logo.bytesPerLine();
QVector<QImage *> imageArray(imageCount);
@@ -535,7 +535,7 @@ void VolumetricModifier::createAnotherVolume()
//logo.load(QStringLiteral(":/logo.png"));
logo = logo.convertToFormat(QImage::Format_ARGB8555_Premultiplied);
qDebug() << "second image dimensions:" << logo.width() << logo.height()
- << logo.byteCount() << (logo.width() * logo.height())
+ << logo.sizeInBytes() << (logo.width() * logo.height())
<< logo.bytesPerLine();
logo.save("d:/qt/goobar.png");