summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-0811-470/+435
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0711-470/+435
| |\
| | * uic: Improve messages.Friedemann Kleint2010-09-071-6/+8
| | * Tools (uic/rcc): Improve warning messages.Friedemann Kleint2010-09-076-19/+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-072-20/+29
| | * 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-073-178/+161
| | * Refactoring QDirPrivate::DataJoão Abecasis2010-09-071-84/+98
| | * Move QFileInfoPrivate methods to QFileInfoPrivate::Data (1st Round)Prasanth Ullattil2010-09-072-89/+90
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-0819-404/+663
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-077-19/+35
| |\ \ \ | | |/ /
| * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0743-561/+2482
| |\ \ \
| * | | | Doc: More work on the QML documentation.David Boddie2010-09-074-51/+95
| * | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0618-252/+145
| |\ \ \ \
| * | | | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-062-34/+91
| * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0327-151/+264
| |\ \ \ \ \
| * | | | | | Doc: qdoc fixes.David Boddie2010-09-022-5/+5
| * | | | | | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-018-49/+58
| * | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0183-1997/+2381
| |\ \ \ \ \ \
| * | | | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-011-5/+6
| * | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-2788-331/+849
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: More work on the QML documentation.David Boddie2010-08-273-204/+263
| * | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-2461-435/+975
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-233-61/+150
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-071-5/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Remove unnecessary function declarations from qpixmap_s60_p.hJani Hautakangas2010-09-071-5/+0
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-071-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0743-561/+2482
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0618-252/+145
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0227-151/+264
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0183-1999/+2381
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-2788-331/+849
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-2461-435/+975
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-17174-874/+1892
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Reworded a brief description for clarity.David Boddie2010-08-171-2/+2
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-073-8/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-073-8/+16
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |