Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits)
  Use native locale aware string comparison on Symbian.
  Temporary fix for regression in QSslCertificate::fromPath()
  doc: Added more DITA output to the XML generator
  Fix symbian building of TARGET with a slash
  Fix a minor typo in QAbstractItemModel's documentation.
  QXmlSchema: allow usage of xsd:all
  QSslSocket: fix build for MinGW and VS 2005
  Fix symbian-abld build failure with bearer plugins
  remove certificate bundle
  make QSslSocket::systemCaCertificates() use system certs
  Adjusted RegExp in QSslCertificate::fromPath()
  Fix QSystemTrayIcon::supportsMessages() on Windows
  Use NIM_SETVERSION to get the latest behavior
  Cleanup obsolete stuff
  doc: Added DITA XML generator
  Fixed a broken merge.
  Changed the way we detect touch screen on Windows.
  Fixed error deploying qsymbianbearer.qtplugin on Symbian.
  Revert "Attempt to fix build failure on Symbian."
  Attempt to fix build failure on Symbian.
  ...

3 files changed, 24 insertions, 20 deletions

diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
index 5b45422..0b5d389 100644
--- a/src/plugins/imageformats/jpeg/jpeg.pro
+++ b/src/plugins/imageformats/jpeg/jpeg.pro
@@ -22,10 +22,9 @@ symbian: {
 }
 
 contains(QT_CONFIG, system-jpeg) {
-        unix:LIBS += -ljpeg
-        win32:LIBS += libjpeg.lib
-}
-!contains(QT_CONFIG, system-jpeg) {
+        unix|win32-g++*:LIBS += -ljpeg
+        win32:!win32-g++*:LIBS += libjpeg.lib
+} else {
 	INCLUDEPATH += ../../../3rdparty/libjpeg
 	SOURCES  += \
 	    ../../../3rdparty/libjpeg/jaricom.c \
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
index de7dfa7..c188b47 100644
--- a/src/plugins/imageformats/mng/mng.pro
+++ b/src/plugins/imageformats/mng/mng.pro
@@ -14,10 +14,9 @@ symbian: {
 }
 
 contains(QT_CONFIG, system-mng) {
-        unix:LIBS += -lmng
-        win32:LIBS += libmng.lib
-}
-!contains(QT_CONFIG, system-mng) {
+        unix|win32-g++*:LIBS += -lmng
+        win32:!win32-g++*:LIBS += libmng.lib
+} else {
         DEFINES += MNG_BUILD_SO
         DEFINES += MNG_NO_INCLUDE_JNG
 	INCLUDEPATH += ../../../3rdparty/libmng
@@ -44,10 +43,11 @@ contains(QT_CONFIG, system-mng) {
 }
 
 contains(QT_CONFIG, system-zlib) {
-        LIBS += -lz
-}
-!contains(QT_CONFIG, system-zlib) {
-        INCLUDEPATH +=  ../../../3rdparty/zlib
+    symbian:LIBS_PRIVATE += -llibz
+    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
+    else:LIBS += zdll.lib
+} else {
+    INCLUDEPATH +=  ../../../3rdparty/zlib
 }
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 3cb64ad..90868e8 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -8,10 +8,14 @@ SOURCES += main.cpp \
            qtiffhandler.cpp
 
 contains(QT_CONFIG, system-tiff) {
-        unix:LIBS += -ltiff
-        win32:LIBS += libtiff.lib
-}
-!contains(QT_CONFIG, system-tiff) {
+        unix|win32-g++*:LIBS += -ltiff
+        win32:!win32-g++*:LIBS += libtiff.lib
+
+        contains(QT_CONFIG, system-jpeg) {
+                unix|win32-g++*:LIBS += -ljpeg
+                win32:!win32-g++*:LIBS += libjpeg.lib
+        }
+} else {
 	INCLUDEPATH += ../../../3rdparty/libtiff/libtiff
 	SOURCES  += \
 	    ../../../3rdparty/libtiff/libtiff/tif_aux.c \
@@ -64,10 +68,11 @@ contains(QT_CONFIG, system-tiff) {
 }
 
 contains(QT_CONFIG, system-zlib) {
-        LIBS += -lz
-}
-!contains(QT_CONFIG, system-zlib) {
-        INCLUDEPATH +=  ../../../3rdparty/zlib
+    symbian:LIBS_PRIVATE += -llibz
+    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
+    else:LIBS += zdll.lib
+} else {
+    INCLUDEPATH +=  ../../../3rdparty/zlib
 }
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats