diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-09 07:17:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-09 07:17:15 (GMT) |
| commit | 6919e1e9d36d83958750a42e1f8d567f2f74299e (patch) | |
| tree | ccbf58400efc7546fd0f5bd58c3855180146934f /tests/auto/qsocks5socketengine | |
| parent | a9dc52d88fd40f55acfcbb64131291dea18d8ccc (diff) | |
| parent | d030e69cbabfcae81054e5b8c893b28b2d9de38b (diff) | |
| download | Qt-6919e1e9d36d83958750a42e1f8d567f2f74299e.zip Qt-6919e1e9d36d83958750a42e1f8d567f2f74299e.tar.gz Qt-6919e1e9d36d83958750a42e1f8d567f2f74299e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Work around a compiler bug on 64-bit.
Fix handling of braces/no-braces in QUrl::host / setHost.
Changes (and minor corrections) to QByteArray documentation.
QtWebKit: Update tag files to match the same content on qtwebkit.git
QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
uic: Fix compile breakage in case QT_NO_QT3_SUPPORT.
uic: Improve messages.
Tools (uic/rcc): Improve warning messages.
QDir: Removed checks for existance of fileEngine
QDir and QFileInfo shouldn't lose properties when detaching
Another bug-o introduced in fixing QDirPrivate refactoring
Reverting QDir::detach introduced earlier
QFileInfo: Prepare for engine-less implementation
Removed QFileInfoPrivate::initFileEngine
Simplify QDir::cd
QDir::makeAbsolute could self-destruct on failure
QDir::operator= simplification
QDirPrivate refactoring
QDirPrivate refactoring
...
Diffstat (limited to 'tests/auto/qsocks5socketengine')
0 files changed, 0 insertions, 0 deletions