diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-12 12:37:12 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-12 12:37:12 +0300 |
commit | 109a0b93b43a5b1858b2bbf2478b21cf6204c2f9 (patch) | |
tree | 18c4cd3741af11a5e1994ae4a829ba34ad6d6627 | |
parent | 293252db84f9ad3b6f6bdb4d467aee88d4ee7f94 (diff) | |
parent | 9b50f3f7d49f57712517d1d05de69ec7495c13f9 (diff) |
Merge remote-tracking branch 'origin/develop'v1.1.0
Change-Id: I2e8d3b81c2f402dce9dffb82e9b676d691882f05
-rw-r--r-- | src/datavisualization/utils/texturehelper.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/utils/utils.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp index 185d99e4..2a2a89dd 100644 --- a/src/datavisualization/utils/texturehelper.cpp +++ b/src/datavisualization/utils/texturehelper.cpp @@ -41,7 +41,7 @@ GLuint TextureHelper::create2DTexture(const QImage &image, bool useTrilinearFilt QImage texImage = image; -#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) +#if defined(QT_OPENGL_ES_2) GLuint temp; GLuint imageWidth = Utils::getNearestPowerOfTwo(image.width(), temp); GLuint imageHeight = Utils::getNearestPowerOfTwo(image.height(), temp); diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index 5852bf11..2368d86a 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -67,11 +67,11 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo valueStrWidth += paddingWidth / 2; // Fix clipping problem with skewed fonts (italic or italic-style) QSize labelSize; -#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) - // Android can't handle textures with dimensions not in power of 2. Resize labels accordingly. +#if defined(QT_OPENGL_ES_2) + // ES2 can't handle textures with dimensions not in power of 2. Resize labels accordingly. // Add some padding before converting to power of two to avoid too tight fit GLuint prePadding = 5; - // Android needs to use this always (when given) because of the power of 2 -issue. + // ES2 needs to use this always (when given) because of the power of 2 -issue. if (maxLabelWidth) valueStrWidth = maxLabelWidth + paddingWidth / 2; labelSize = QSize(valueStrWidth + prePadding, valueStrHeight + prePadding); @@ -96,7 +96,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo painter.setFont(valueFont); if (!labelBackground) { painter.setPen(txtColor); -#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) +#if defined(QT_OPENGL_ES_2) painter.drawText((labelSize.width() - valueStrWidth) / 2.0f, (labelSize.height() - valueStrHeight) / 2.0f, valueStrWidth, valueStrHeight, |