diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-17 20:57:50 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-17 20:57:50 +0200 |
commit | a72d34d26e6a02b9d836a9a3ade3d97930818fe6 (patch) | |
tree | 63448fc192275fa107c7cd4ca6957df1688b656a | |
parent | e409eafe23c8f90a01ed198090c2d7df0d07e708 (diff) | |
parent | 209a75f2d071e0977b6c0a8a2ce5d6eb0ff95b8c (diff) |
Merge remote-tracking branch 'origin/5.3.2' into 5.3
Change-Id: Iae36a5178c0411d4d36508e0725e132af390157a
-rw-r--r-- | dist/changes-5.3.2 | 69 | ||||
-rw-r--r-- | src/plugins/platforms/android/qandroidplatformopenglcontext.cpp | 26 |
2 files changed, 74 insertions, 21 deletions
diff --git a/dist/changes-5.3.2 b/dist/changes-5.3.2 index 58f53024e2..dd0aeff80e 100644 --- a/dist/changes-5.3.2 +++ b/dist/changes-5.3.2 @@ -1,5 +1,5 @@ Qt 5.3.2 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.3.0. +compatibility (source and binary) with Qt 5.3.0 and Qt 5.3.1. For more details, refer to the online documentation included in this distribution. The documentation is also available online: @@ -24,15 +24,41 @@ information about a particular change. QtCore ------ + - QObject: + * [QTBUG-40638] Fixed disconnecting from pointer to member signal that + belongs in the base class but whose type is explicitly given as a + pointer to a member in the derived class + QtGui ----- -QtSql ------ + - Fonts: + * [QTBUG-39846] Fixed regression in font families returned by + QFontDatabase::families() for certain writing systems. + + - QImage: + * QImage::fill(uint) now fills the given pixel value unconverted when + used on RGBA8888 image, making it consistent with the documentation + and treatment of all other image formats. + + - Text: + * [QTBUG-39832] Fixed lines breaking on non-breaking spaces. + * [QTBUG-39930][QTBUG-39860] Fixed several regressions in font selection + when combining different writing systems in the same text. -QtWidgets +QtNetwork --------- + - [QTBUG-30829][QTBUG-35101] Fixed NTLM (SSPI) Proxy Authentication + (HTTP/HTTPS) + + - QNetworkAccessManager: + * Fixed high CPU load when handling POST/upload QIODevice that generates + data on readyRead(). + * [QTBUG-40797] QNetworkAccessManager now properly handles FTP transfer + failures by removing failed cached ftp connections. + + **************************************************************************** * Platform Specific Changes * **************************************************************************** @@ -40,12 +66,33 @@ QtWidgets Android ------- -**************************************************************************** -* Tools * -**************************************************************************** + - [QTBUG-39978] Fixed regression where QScreen::physicalSize() would + return 0x0. + - Added support for building libraries with spaces in name. + - [QTBUG-39377] Fixed common characters like digits and punctuation + showing as boxes when positioned next to non-latin scripts. + - [QTBUG-39377] Fixed common characters like digits and punctuation + showing as boxes when positioned next to non-latin scripts. + - Fixed font selection to prefer "Droid Serif" when Serif style hint is + set on QFont. + - [QTBUG-40957] Fixed bug on some devices where the application would + crash at shutdown if the virtual keyboard was open. + +EGLFS +----- -configure & build system ------------------------- + - Double click events are now sent correctly on eglfs. -qmake ------ +Windows +------- + + - [QTBUG-39172] Fixed using QRawFont with fallback fonts, e.g. in the case + of text rendering in Qt Quick. + +X11 / XCB +--------- + + - [QTBUG-39666][QTBUG-39573][QTBUG-39570] QTabletEvents and proximity + events correctly identify the tool in use; the meaning of certain + valuators depends on the tool; and the valuators' current values are + not lost between events diff --git a/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp b/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp index a352d3ebb8..dfc43f0fa5 100644 --- a/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp +++ b/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp @@ -70,16 +70,22 @@ bool QAndroidPlatformOpenGLContext::needsFBOReadBackWorkaround() static bool needsWorkaround = false; if (!set) { - const char *rendererString = reinterpret_cast<const char *>(glGetString(GL_RENDERER)); - needsWorkaround = - qstrncmp(rendererString, "Mali-4xx", 6) == 0 // Mali-400, Mali-450 - || qstrncmp(rendererString, "Adreno (TM) 2xx", 13) == 0 // Adreno 200, 203, 205 - || qstrncmp(rendererString, "Adreno 2xx", 8) == 0 // Same as above but without the '(TM)' - || qstrncmp(rendererString, "Adreno (TM) 30x", 14) == 0 // Adreno 302, 305 - || qstrncmp(rendererString, "Adreno 30x", 9) == 0 // Same as above but without the '(TM)' - || qstrcmp(rendererString, "GC800 core") == 0 - || qstrcmp(rendererString, "GC1000 core") == 0 - || qstrcmp(rendererString, "Immersion.16") == 0; + QByteArray env = qgetenv("QT_ANDROID_DISABLE_GLYPH_CACHE_WORKAROUND"); + needsWorkaround = env.isEmpty() || env == "0" || env == "false"; + + if (!needsWorkaround) { + const char *rendererString = reinterpret_cast<const char *>(glGetString(GL_RENDERER)); + needsWorkaround = + qstrncmp(rendererString, "Mali-4xx", 6) == 0 // Mali-400, Mali-450 + || qstrncmp(rendererString, "Adreno (TM) 2xx", 13) == 0 // Adreno 200, 203, 205 + || qstrncmp(rendererString, "Adreno 2xx", 8) == 0 // Same as above but without the '(TM)' + || qstrncmp(rendererString, "Adreno (TM) 30x", 14) == 0 // Adreno 302, 305 + || qstrncmp(rendererString, "Adreno 30x", 9) == 0 // Same as above but without the '(TM)' + || qstrcmp(rendererString, "GC800 core") == 0 + || qstrcmp(rendererString, "GC1000 core") == 0 + || qstrcmp(rendererString, "Immersion.16") == 0; + } + set = true; } |