summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0825-510/+657
|\
| * Work around a compiler bug on 64-bit.Thiago Macieira2010-09-081-3/+6
| * Merge commit 'refs/merge-requests/2464' of git://gitorious.org/qt/qt into int...David Boddie2010-09-081-6/+0
| |\
| | * Correct QNetworkReply::downloadProgress and uploadProgress docsJohn Brooks2010-09-011-6/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-09-08152-1980/+4158
| |\ \
| | * | Fix handling of braces/no-braces in QUrl::host / setHost.Thiago Macieira2010-09-082-1/+9
| | * | QtWebKit: Update tag files to match the same content on qtwebkit.gitJocelyn Turcotte2010-09-082-2/+2
| | * | QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-082-1/+13
| | * | QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-081-4/+4
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0816-481/+594
| | |\ \
| | | * | uic: Fix compile breakage in case QT_NO_QT3_SUPPORT.Friedemann Kleint2010-09-081-1/+1
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0816-481/+594
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0716-481/+594
| | | | |\ \
| | | | | * | uic: Improve messages.Friedemann Kleint2010-09-071-6/+8
| | | | | * | Tools (uic/rcc): Improve warning messages.Friedemann Kleint2010-09-077-20/+48
| | | | | * | QDir: Removed checks for existance of fileEngineJoão Abecasis2010-09-071-49/+8
| | | | | * | QDir and QFileInfo shouldn't lose properties when detachingJoão Abecasis2010-09-074-20/+176
| | | | | * | Another bug-o introduced in fixing QDirPrivate refactoringJoão Abecasis2010-09-071-0/+1
| | | | | * | Reverting QDir::detach introduced earlierJoão Abecasis2010-09-072-51/+33
| | | | | * | QFileInfo: Prepare for engine-less implementationJoão Abecasis2010-09-072-46/+59
| | | | | * | Removed QFileInfoPrivate::initFileEngineJoão Abecasis2010-09-072-13/+4
| | | | | * | Simplify QDir::cdJoão Abecasis2010-09-071-2/+1
| | | | | * | QDir::makeAbsolute could self-destruct on failureJoão Abecasis2010-09-071-7/+4
| | | | | * | QDir::operator= simplificationJoão Abecasis2010-09-071-3/+0
| | | | | * | QDirPrivate refactoringJoão Abecasis2010-09-071-1/+3
| | | | | * | QDirPrivate refactoringJoão Abecasis2010-09-071-20/+20
| | | | | * | QDirPrivate refactoringJoão Abecasis2010-09-071-25/+24
| | | | | * | Removed QDirPrivate layer of indirectionJoão Abecasis2010-09-072-229/+216
| | | | | * | Refactor QFileInfoPrivate::Data (Round 2)Prasanth Ullattil2010-09-074-186/+170
| | | | | * | Refactoring QDirPrivate::DataJoão Abecasis2010-09-071-84/+98
| | | | | * | Move QFileInfoPrivate methods to QFileInfoPrivate::Data (1st Round)Prasanth Ullattil2010-09-072-89/+90
| | | | | * | explicitly remove qt_webkit_version.pri when building with -no-webkitOswald Buddenhagen2010-09-072-2/+3
| * | | | | | Merge commit 'refs/merge-requests/2468' of git://gitorious.org/qt/qt into int...David Boddie2010-09-081-12/+29
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Changes (and minor corrections) to QByteArray documentation.Robin Burchell2010-09-081-12/+29
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-085-6/+5
|\ \ \ \ \ \ \
| * | | | | | | Let's not duplicate Symbian softkey menu top-level actions in submenu.Janne Anttila2010-09-081-1/+1
| * | | | | | | Remove some .pro statements left behind after IAP usage cleanupMiikka Heikkinen2010-09-082-4/+0
| * | | | | | | Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.Miikka Heikkinen2010-09-082-1/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0834-114/+461
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix compilation on Windows CEBradley T. Hughes2010-09-081-1/+1
| * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0834-113/+460
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0834-113/+460
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0734-113/+460
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0734-113/+460
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-0734-113/+460
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-09-0630-100/+381
| | | | | |\ \ \
| | | | | | * | | Add missing license headerJan-Arve Sæther2010-09-062-0/+82
| | | | | | * | | Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.Jan-Arve Sæther2010-09-062-0/+8
| | | | | | * | | Compile fix WinCEJan-Arve Sæther2010-09-032-5/+14
| | | | | | * | | Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-0328-100/+282