Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I8f788167e37c9b9ca3f4a59a9785a435eeaa6317

7 files changed, 87 insertions, 25 deletions

diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri
index 9e743f0..3479d85 100644
--- a/src/3rdparty/libtiff.pri
+++ b/src/3rdparty/libtiff.pri
@@ -34,8 +34,7 @@ SOURCES += \
     $$PWD/libtiff/libtiff/tif_write.c \
     $$PWD/libtiff/libtiff/tif_zip.c
 
-wince*:       SOURCES += $$PWD/../corelib/kernel/qfunctions_wince.cpp \
-                         $$PWD/libtiff/libtiff/tif_wince.c
+wince*:       SOURCES += $$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
diff --git a/src/imageformats/doc/qtimageformats.qdocconf b/src/imageformats/doc/qtimageformats.qdocconf
index d2b4556..39845aa 100644
--- a/src/imageformats/doc/qtimageformats.qdocconf
+++ b/src/imageformats/doc/qtimageformats.qdocconf
@@ -1,7 +1,7 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 # Name of the project.
-project     = qtimageformats
+project     = QtImageFormats
 description = Qt Image Formats Documentation
 url         = http://qt-project.org/doc/qt-$QT_VER/qtimageformats
 version     = $QT_VERSION
@@ -22,26 +22,26 @@ depends     += qtcore qtgui
 # Defines the name of the project. You cannot use operators (+, =, -) in
 # the name. Properties for this project are set using a qhp.<projectname>.property
 # format.
-qhp.projects = qtimageformats
+qhp.projects = QtImageFormats
 
 # Sets the name of the output qhp file.
-qhp.qtimageformats.file = qtimageformats.qhp
+qhp.QtImageFormats.file = qtimageformats.qhp
 
 # Namespace for the output file. This namespace is used to distinguish between
 # different documentation files in Creator/Assistant. The namespace ends with
 # a version being a number containing a major, minor and revision element.
 # E.g. version 1.0 becomes 100.
-qhp.qtimageformats.namespace = org.qt-project.qtimageformats.$QT_VERSION_TAG
+qhp.QtImageFormats.namespace = org.qt-project.qtimageformats.$QT_VERSION_TAG
 
 # Title for the package, will be the main title for the package in
 # Assistant/Creator.
-qhp.qtimageformats.indexTitle = Qt Image Formats
+qhp.QtImageFormats.indexTitle = Qt Image Formats
 
 # Extra files to add to the output which are not linked to from anywhere
 # using a qdoc \l command.
-qhp.qtimageformats.extraFiles = style/style.css \
+qhp.QtImageFormats.extraFiles = style/style.css \
                         index.html
 
-# Only updtae the name of the project for the next variables.
-qhp.qtimageformats.virtualFolder  = qtimageformats
+# Only update the name of the project for the next variables.
+qhp.QtImageFormats.virtualFolder  = qtimageformats
 
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
index 9890c11..f4e79af 100644
--- a/src/plugins/imageformats/mng/mng.pro
+++ b/src/plugins/imageformats/mng/mng.pro
@@ -4,15 +4,6 @@ PLUGIN_TYPE = imageformats
 PLUGIN_CLASS_NAME = QMngPlugin
 load(qt_plugin)
 
-HEADERS += qmnghandler_p.h
-SOURCES += qmnghandler.cpp
-OTHER_FILES += mng.json
-config_libmng {
-    unix|win32-g++*: LIBS += -lmng
-    else:win32: LIBS += libmng.lib
-} else {
-    include($$PWD/../../../3rdparty/libmng.pri)
-    *-g++*: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter
-}
-
+include(qmnghandler.pri)
 SOURCES += main.cpp
+OTHER_FILES += mng.json
diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri
index ffb98de..cdf17c5 100644
--- a/src/plugins/imageformats/mng/qmnghandler.pri
+++ b/src/plugins/imageformats/mng/qmnghandler.pri
@@ -2,9 +2,10 @@
 INCLUDEPATH *= $$PWD
 HEADERS += $$PWD/qmnghandler_p.h
 SOURCES += $$PWD/qmnghandler.cpp
-contains(QT_CONFIG, system-mng) {
-        if(unix|win32-g++*):LIBS += -lmng
-        else:win32:         LIBS += libmng.lib
+config_libmng {
+    unix|win32-g++*: LIBS += -lmng
+    else:win32: LIBS += libmng.lib
 } else {
-    include($$PWD/../../3rdparty/libmng.pri)
+    include($$PWD/../../../3rdparty/libmng.pri)
+    *-g++*: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter
 }
diff --git a/src/plugins/imageformats/tga/qtgahandler.cpp b/src/plugins/imageformats/tga/qtgahandler.cpp
index fe1b09b..f446db1 100644
--- a/src/plugins/imageformats/tga/qtgahandler.cpp
+++ b/src/plugins/imageformats/tga/qtgahandler.cpp
@@ -80,6 +80,8 @@ bool QTgaHandler::canRead(QIODevice *device)
 
     // TGA reader implementation needs a seekable QIODevice, so
     // sequential devices are not supported
+    if (device->isSequential())
+        return false;
     qint64 pos = device->pos();
     bool isValid;
     {
diff --git a/src/plugins/imageformats/tiff/qfunctions_wince.cpp b/src/plugins/imageformats/tiff/qfunctions_wince.cpp
new file mode 100644
index 0000000..d4ea364
--- /dev/null
+++ b/src/plugins/imageformats/tiff/qfunctions_wince.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifdef _WIN32_WCE //Q_OS_WINCE
+
+#include "qplatformdefs.h"
+
+QT_USE_NAMESPACE
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *lfind(const void* key, const void* base, size_t* elements, size_t size,
+            int (__cdecl *compare)(const void*, const void*))
+{
+    const char* current = (char*) base;
+    const char* const end = (char*) (current + (*elements) * size);
+    while (current != end) {
+        if (compare(current, key) == 0)
+            return (void*)current;
+        current += size;
+    }
+    return 0;
+}
+
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+#endif // Q_OS_WINCE
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 66eea8c..353e3f3 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -6,6 +6,7 @@ load(qt_plugin)
 
 HEADERS += qtiffhandler_p.h
 SOURCES += main.cpp qtiffhandler.cpp
+wince*: SOURCES += qfunctions_wince.cpp
 OTHER_FILES += tiff.json
 
 config_libtiff {