1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QtNetwork compilation for -qconfig large

Browse Source 
Change-Id: I231272e59101e9492a7a1edbacab165b96927877
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
This commit is contained in:
Tasuku Suzuki 2012-05-17 05:01:36 +09:00 committed by Qt by Nokia
parent b16a307dbc
commit 864e996384
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qfeatures.h
View File

@ -377,7 +377,7 @@
#endif
// Bearer Management
#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY))
#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY) || defined(QT_NO_PROPERTIES))
#define QT_NO_BEARERMANAGEMENT
#endif

2
src/corelib/global/qfeatures.txt
View File

@ -1049,7 +1049,7 @@ SeeAlso: ???
Feature: BEARERMANAGEMENT
Description: Provides bearer management support
Section: Networking
Requires: LIBRARY NETWORKINTERFACE
Requires: LIBRARY NETWORKINTERFACE PROPERTIES
Name: Bearer Management
SeeAlso: ???

2
src/network/access/qnetworkaccessmanager.cpp
View File

@ -416,7 +416,9 @@ QNetworkAccessManager::QNetworkAccessManager(QObject *parent)
qRegisterMetaType<QSslConfiguration>("QSslConfiguration");
#endif
qRegisterMetaType<QList<QPair<QByteArray,QByteArray> > >("QList<QPair<QByteArray,QByteArray> >");
#ifndef QT_NO_HTTP
qRegisterMetaType<QHttpNetworkRequest>("QHttpNetworkRequest");
#endif
qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError");
qRegisterMetaType<QSharedPointer<char> >("QSharedPointer<char>");
}

3
src/network/access/qnetworkaccessmanager_p.h
View File

@ -162,8 +162,9 @@ public:
static inline QNetworkAccessCache *getObjectCache(QNetworkAccessBackend *backend)
{ return &backend->manager->objectCache; }
Q_AUTOTEST_EXPORT static void clearCache(QNetworkAccessManager *manager);
#ifndef QT_NO_BEARERMANAGEMENT
Q_AUTOTEST_EXPORT static const QWeakPointer<const QNetworkSession> getNetworkSession(const QNetworkAccessManager *manager);
#endif
Q_DECLARE_PUBLIC(QNetworkAccessManager)
};

2
src/network/access/qnetworkreplyimpl.cpp
View File

@ -136,11 +136,13 @@ void QNetworkReplyImplPrivate::_q_startOperation()
return;
}
#ifndef QT_NO_BEARERMANAGEMENT
if (session) {
//get notification of policy changes.
QObject::connect(session.data(), SIGNAL(usagePoliciesChanged(QNetworkSession::UsagePolicies)),
q, SLOT(_q_networkSessionUsagePoliciesChanged(QNetworkSession::UsagePolicies)));
}
#endif
if (backend && backend->isSynchronous()) {
state = Finished;