diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | config.tests/libmng/libmng.pro | 4 | ||||
| -rw-r--r-- | config.tests/libtiff/libtiff.pro | 4 | ||||
| -rw-r--r-- | src/3rdparty/libtiff.pri | 1 | ||||
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_config.h | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/mng/qmnghandler.cpp | 8 | ||||
| -rw-r--r-- | sync.profile | 2 |
7 files changed, 18 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index a5c6224..f5a422c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.0.2 +MODULE_VERSION = 5.1.0 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro index ee57ecd..7a45825 100644 --- a/config.tests/libmng/libmng.pro +++ b/config.tests/libmng/libmng.pro @@ -1,4 +1,6 @@ SOURCES = libmng.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle -LIBS += -lmng +win32:CONFIG += console +unix|win32-g++*: LIBS += -lmng +else:win32: LIBS += libmng.lib diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro index 60ba7d1..47a8437 100644 --- a/config.tests/libtiff/libtiff.pro +++ b/config.tests/libtiff/libtiff.pro @@ -1,4 +1,6 @@ SOURCES = libtiff.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle -LIBS += -ltiff +win32:CONFIG += console +unix|win32-g++*: LIBS += -ltiff +else:win32: LIBS += libtiff.lib diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri index 921b3e6..9e743f0 100644 --- a/src/3rdparty/libtiff.pri +++ b/src/3rdparty/libtiff.pri @@ -38,5 +38,6 @@ wince*: SOURCES += $$PWD/../corelib/kernel/qfunctions_wince.cpp \ $$PWD/libtiff/libtiff/tif_wince.c win32: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c else: SOURCES += $$PWD/libtiff/libtiff/tif_unix.c +android: SOURCES += $$PWD/libtiff/port/lfind.c include($$PWD/zlib_dependency.pri) diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h index f851384..dc579c3 100644 --- a/src/3rdparty/libtiff/libtiff/tif_config.h +++ b/src/3rdparty/libtiff/libtiff/tif_config.h @@ -110,7 +110,7 @@ /* #undef HAVE_PTHREAD */ /* Define to 1 if you have the <search.h> header file. */ -#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS) +#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS) && !defined(Q_OS_ANDROID) #define HAVE_SEARCH_H 1 #endif diff --git a/src/plugins/imageformats/mng/qmnghandler.cpp b/src/plugins/imageformats/mng/qmnghandler.cpp index 395a783..1ee3bbd 100644 --- a/src/plugins/imageformats/mng/qmnghandler.cpp +++ b/src/plugins/imageformats/mng/qmnghandler.cpp @@ -263,6 +263,7 @@ mng_bool QMngHandlerPrivate::processHeader(mng_uint32 iWidth, mng_uint32 iHeight bool QMngHandlerPrivate::getNextImage(QImage *result) { mng_retcode ret; + const bool savedHaveReadAll = haveReadAll; if (haveReadNone) { haveReadNone = false; ret = mng_readdisplay(hMNG); @@ -271,6 +272,13 @@ bool QMngHandlerPrivate::getNextImage(QImage *result) } if ((MNG_NOERROR == ret) || (MNG_NEEDTIMERWAIT == ret)) { *result = image; + + // QTBUG-28894 -- libmng produces an extra frame at the end + // of the animation on the first loop only. + if (nextDelay == 1 && (!savedHaveReadAll && haveReadAll)) { + ret = mng_display_resume(hMNG); + } + frameIndex = nextIndex++; if (haveReadAll && (frameCount == 0)) frameCount = nextIndex; diff --git a/sync.profile b/sync.profile index 26326b6..ccc4a15 100644 --- a/sync.profile +++ b/sync.profile @@ -5,5 +5,5 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/release", + "qtbase" => "refs/heads/stable", ); |