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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  don't crash in QProcessEnvironment::systemEnvironment()
  qmake: Introduce new template type
  no environment on WinCE
  fix Widestring vs. Ansi mixup
  fix potential crash in QProcessEnvironment::systemEnvironment() on windows
  Fix compilation with QT_NO_*
  fix build on symbian
  skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor
  fix build on mac
  make QProcessEnvironment on Unix cache converted values
  make QProcessEnvironment::systemEnvironment() encoding-safe
  make QProcessEnvironment on Unix cache converted variable names
  move key/value converters to the private class
  make QProcessEnvironment on Windows preserve variable name case
  split QProcessEnvironmentPrivate::Unit into Key and Value
  remove unused functions
  minor optimization: use QList::reserve()
  use the Hash typedef
  Changelog: Qt Designer 4.8

1 files changed, 2 insertions, 0 deletions

diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
index c7bdcb649f..5112af0c37 100644
--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
+++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
@@ -116,6 +116,7 @@ void QDeclarativeDebugServerPrivate::advertisePlugins()
 QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectionPlugin(
     const QString &pluginName)
 {
+#ifndef QT_NO_LIBRARY
     QStringList pluginCandidates;
     const QStringList paths = QCoreApplication::libraryPaths();
     foreach (const QString &libPath, paths) {
@@ -142,6 +143,7 @@ QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectio
             return connection;
         loader.unload();
     }
+#endif
     return 0;
 }