summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-085-18/+89
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-08149-1605/+3663
| |\ \ \
| | * | | Document difference between property binding and assignmentBea Lam2010-09-082-5/+62
| | * | | Remove unused objectBea Lam2010-09-081-1/+0
| | * | | Fix Worker ListModel to emit the right signal when items changeBea Lam2010-09-081-1/+1
| |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-08115-1396/+3366
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0723-133/+169
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0786-1657/+4605
| |\ \ \ \
| * | | | | Doc: More work on the QML documentation.David Boddie2010-09-0716-116/+502
| * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0643-335/+549
| |\ \ \ \ \
| * | | | | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-065-36/+93
| * | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0389-634/+2028
| |\ \ \ \ \ \
| * | | | | | | Doc: qdoc fixes.David Boddie2010-09-023-7/+7
| * | | | | | | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-018-49/+58
| * | | | | | | Doc: Fixed autotest breakage caused by snippets.David Boddie2010-09-0113-16/+124
| * | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-01218-3869/+8160
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-017-6/+86
| * | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-27206-558/+5907
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Fixed links and markup.David Boddie2010-08-271-5/+5
| * | | | | | | | | Doc: More work on the QML documentation.David Boddie2010-08-2729-209/+955
| * | | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-24201-17039/+16767
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Doc: Minor improvements and fixes.David Boddie2010-08-242-5/+5
| * | | | | | | | | | Doc: Fixed incorrect use of commands to mark documentation.David Boddie2010-08-233-3/+1
| * | | | | | | | | | Doc: Started to improve QML reference documentation.David Boddie2010-08-234-63/+152
| * | | | | | | | | | Doc: Moved the inline code into snippet files.David Boddie2010-08-231-57/+10
| * | | | | | | | | | Doc: Started to reorganize the QML documentation structure.David Boddie2010-08-231-30/+67