Commit b4001eac authored by Tasuku Suzuki's avatar Tasuku Suzuki Committed by Qt by Nokia
Browse files

Fix compilation with QT_NO_*


Merge-request: 1206
Reviewed-by: default avatarOswald 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: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@nokia.com>
parent 26e15e87
Branches
Tags
No related merge requests found
Showing with 2 additions and 0 deletions
...@@ -122,6 +122,7 @@ void QDeclarativeDebugServerPrivate::advertisePlugins() ...@@ -122,6 +122,7 @@ void QDeclarativeDebugServerPrivate::advertisePlugins()
QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectionPlugin( QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectionPlugin(
const QString &pluginName) const QString &pluginName)
{ {
#ifndef QT_NO_LIBRARY
QStringList pluginCandidates; QStringList pluginCandidates;
const QStringList paths = QCoreApplication::libraryPaths(); const QStringList paths = QCoreApplication::libraryPaths();
foreach (const QString &libPath, paths) { foreach (const QString &libPath, paths) {
...@@ -148,6 +149,7 @@ QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectio ...@@ -148,6 +149,7 @@ QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectio
return connection; return connection;
loader.unload(); loader.unload();
} }
#endif
return 0; return 0;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment