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: (55 commits)
  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.
  Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else"
  Updated leading whitespace to make indentation more consistent
  Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
  make postgresql support sensitive to PSQL_LIBS
  support for cross building Qt for MinGW (win32-g++) on Unix
  use "win32-g++*" scope to match all MinGW makespecs
  Demos: Fix compilation with namespace.
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 4e0ebbc..e579dd5 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -106,8 +106,9 @@ contains(QT_CONFIG, zlib) {
         ../3rdparty/zlib/uncompr.c \
         ../3rdparty/zlib/zutil.c
 } else:!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS_PRIVATE += -lz
-#  win32:LIBS += libz.lib
+    symbian:LIBS_PRIVATE += -llibz
+    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
+    else:LIBS += zdll.lib
 }
 
 DEFINES += HB_EXPORT=Q_CORE_EXPORT