From: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Date: Mon, 2 May 2011 09:23:47 +0000 (+0200)
Subject: Fix compilation with QT_NO_*
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=b4001eacd6472a3515a0eb7d80e845bd733d5bcd;p=konrad%2Fqtdeclarative.git

Fix compilation with QT_NO_*

Merge-request: 1206
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

(cherry picked from commit eb61f612fea1b76fe01ee237e5bd160f66aeca3d)

Conflicts:
	src/network/access/qhttpthreaddelegate.cpp
	src/network/access/qhttpthreaddelegate_p.h

Change-Id: Id4f8154d1b5f69ab490d9818facfdf5a733ec794
Reviewed-on: http://codereview.qt-project.org/4593
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---

diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
index f815f33..da7a8d2 100644
--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
+++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
@@ -122,6 +122,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) {
@@ -148,6 +149,7 @@ QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectio
             return connection;
         loader.unload();
     }
+#endif
     return 0;
 }