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 /src/datavisualization/utils/texturehelper.cpp | |
| parent | 293252db84f9ad3b6f6bdb4d467aee88d4ee7f94 (diff) | |
| parent | 9b50f3f7d49f57712517d1d05de69ec7495c13f9 (diff) | |
Merge remote-tracking branch 'origin/develop'v1.1.0
Change-Id: I2e8d3b81c2f402dce9dffb82e9b676d691882f05
Diffstat (limited to 'src/datavisualization/utils/texturehelper.cpp')
| -rw-r--r-- | src/datavisualization/utils/texturehelper.cpp | 2 |
1 files changed, 1 insertions, 1 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); |