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>
QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectionPlugin(
const QString &pluginName)
{
+#ifndef QT_NO_LIBRARY
QStringList pluginCandidates;
const QStringList paths = QCoreApplication::libraryPaths();
foreach (const QString &libPath, paths) {
return connection;
loader.unload();
}
+#endif
return 0;
}