AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation with QT_NO_*

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

(cherry picked from commit eb61f612fea1b76fe01ee237e5bd160f66aeca3d)

Conflicts:
	src/declarative/debugger/qdeclarativedebugserver.cpp

Change-Id: I8ff647b1e331b0c855a8f63d16a4f3cacd8e436c
Reviewed-on: http://codereview.qt-project.org/4567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Tasuku Suzuki 2011-05-02 11:23:47 +02:00 committed by Qt by Nokia
parent 549b2fa246
commit cbe824da6c
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/access/qhttpthreaddelegate.cpp
View File

@ -51,6 +51,7 @@
#include "private/qnetworkaccesscache_p.h"
#include "private/qnoncontiguousbytedevice_p.h"
#ifndef QT_NO_HTTP
QT_BEGIN_NAMESPACE
@ -576,4 +577,6 @@ void QHttpThreadDelegate::synchronousProxyAuthenticationRequiredSlot(const QNet
#endif
#endif // QT_NO_HTTP
QT_END_NAMESPACE

4
src/network/access/qhttpthreaddelegate_p.h
View File

@ -68,6 +68,8 @@
#include "private/qnoncontiguousbytedevice_p.h"
#include "qnetworkaccessauthenticationmanager_p.h"
#ifndef QT_NO_HTTP
QT_BEGIN_NAMESPACE
class QAuthenticator;
@ -285,4 +287,6 @@ signals:
QT_END_NAMESPACE
#endif // QT_NO_HTTP
#endif // QHTTPTHREADDELEGATE_H