diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-16 18:47:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-16 18:47:40 (GMT) |
| commit | dee5662e0218e754d425c8960edb1e8ffd27fde6 (patch) | |
| tree | 3690ea636187c9af9459ff3bfd4cab3e2af97c57 /src/network/access/access.pri | |
| parent | f08181c9b252ee8fd53aec8f7ab76dfa6d4f8f0f (diff) | |
| parent | 9db05f0b7bf68392dc925d4047aa74dac88b348a (diff) | |
| download | Qt-dee5662e0218e754d425c8960edb1e8ffd27fde6.zip Qt-dee5662e0218e754d425c8960edb1e8ffd27fde6.tar.gz Qt-dee5662e0218e754d425c8960edb1e8ffd27fde6.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (52 commits)
Add experimental support for armCC on Linux
Fixed resizing popups with QSizeGrip on X11
Workaround public header depending on private in symbian^3
Fix reversed condition
Fix warning, unused parametter error
Fixed mapFromGlobal in some window managers on X11
Removed obsolete code that was incorrectly handling ConfigureNotify
QMutex: do not use inline mutex in debug.
Fix race condition between QEventLoop::exec and QThread::exit
Remove QThreadData::mutex
tst_qnetworkreply: Use proper test server hostname
demo browser: Verbose output about Zerocopy usage
tst_qnetworkreply: Some additions
QNAM: Delete old file
QNAM: Move authentication cache to separate class
tst_qnetworkreply: Relax a condition
Implement QThreadData::current using __thread
Crash in QFileSystemEngine::canonicalName with older libc version
Fix leak in QFactoryLoader
Fixed "not a valid preprocessing token" on GCCE.
...
Diffstat (limited to 'src/network/access/access.pri')
| -rw-r--r-- | src/network/access/access.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/access.pri b/src/network/access/access.pri index f8dfda6..7497c1a 100644 --- a/src/network/access/access.pri +++ b/src/network/access/access.pri @@ -8,6 +8,7 @@ HEADERS += \ access/qhttpnetworkreply_p.h \ access/qhttpnetworkconnection_p.h \ access/qhttpnetworkconnectionchannel_p.h \ + access/qnetworkaccessauthenticationmanager_p.h \ access/qnetworkaccessmanager.h \ access/qnetworkaccessmanager_p.h \ access/qnetworkaccesscache_p.h \ @@ -42,6 +43,7 @@ SOURCES += \ access/qhttpnetworkreply.cpp \ access/qhttpnetworkconnection.cpp \ access/qhttpnetworkconnectionchannel.cpp \ + access/qnetworkaccessauthenticationmanager.cpp \ access/qnetworkaccessmanager.cpp \ access/qnetworkaccesscache.cpp \ access/qnetworkaccessbackend.cpp \ |