diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2011-05-02 11:23:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-21 16:53:48 +0200 |
| commit | b4001eacd6472a3515a0eb7d80e845bd733d5bcd (patch) | |
| tree | fc0b1afa622c8ac8d2fef9999cd222e873212b90 | |
| parent | 26e15e877fb7db31928e1e90aa50bca841522711 (diff) | |
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>
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugserver.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index f815f332c2..da7a8d2eab 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; } |