summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use binary search int the string2PaperSize() helperKonstantin Ritt2010-12-201-143/+64
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-304-41/+47
|\
| * avoid the warning about comparison between signed and unsigned integersKonstantin Ritt2010-11-301-1/+1
| * QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-303-40/+46
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-11-307-25/+489
|\
| * DEF file freezemread2010-11-297-25/+489
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-294-27/+90
|\ \ | |/ |/|
| * minor optimization: decrease amount of possible detaches to 1Konstantin Ritt2010-11-291-6/+10
| * add reminders for Qt 5.0Konstantin Ritt2010-11-291-3/+3
| * add QChar::currentUnicodeVersion() static memberRitt Konstantin2010-11-292-0/+11
| * make the ArabicShaping parser a bit stricterKonstantin Ritt2010-11-291-13/+56
| * fix a typo in the code rangeKonstantin Ritt2010-11-291-3/+7
| * define a constant for the expected Properties struct sizeKonstantin Ritt2010-11-291-2/+3
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-281-3/+9
|\ \ | |/
| * Rename File > Quit to Exit on Windows.Thiago Macieira2010-11-281-3/+9
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-11-261-1/+1
|\
| * Corrected case on Symbian library.axis2010-11-261-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-265-43/+85
|\ \
| * | gdb_dwarf_index: change version constraint from 72 to 73Arvid Ephraim Picciani2010-11-261-1/+1
| * | Revert "Remove gdb_dwarf_index from maemo mkspec"Arvid Ephraim Picciani2010-11-261-1/+1
| * | Line ending fix.Kim Motoyoshi Kalland2010-11-261-35/+35
| * | Added mipmap property to QGLFramebufferObjectFormat.Kim Motoyoshi Kalland2010-11-263-7/+49
| * | Remove gdb_dwarf_index from maemo mkspecArvid Ephraim Picciani2010-11-261-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-264-123/+103
|\ \ \ | |/ / |/| |
| * | QFileSystemWatcher: don't try to stop non-running threadJoão Abecasis2010-11-262-0/+3
| * | Fix QSettings auto test to use QTRY_VERIFYJoão Abecasis2010-11-261-8/+5
| * | tst_QFileSystemWatcher: Don't exit the event loop on first signal.Tijl Coosemans2010-11-261-8/+0
| * | QPollingFileSystemWatcherEngine: Fix double report of directory change.Tijl Coosemans2010-11-261-2/+8
| * | QKqueueFileSystemWatcherEngine: Use higher file descriptors.Tijl Coosemans2010-11-261-0/+8
| * | QKqueueFileSystemWatcherEngine: Unlock mutex between two events.Tijl Coosemans2010-11-261-13/+6
| * | QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).Tijl Coosemans2010-11-261-65/+69
| * | QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.Tijl Coosemans2010-11-261-1/+2
| * | QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().Tijl Coosemans2010-11-261-13/+1
| * | QKqueueFileSystemWatcherEngine: Use EV_CLEAR instead of EV_ONESHOT.Tijl Coosemans2010-11-261-14/+2
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-11-264-9/+8
|\ \ | |/
| * Merge remote branch 'qt/master'Jason McDonald2010-11-26260-5583/+20779
| |\ | |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-255-1/+11
|\ \
| * | Fix some memory leaks.Fabien Freling2010-11-255-1/+11
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-256-4/+95
|\ \ \
| * | | fix performance penalty in Win32MakefileGenerator::findHighestVersionJoerg Bornemann2010-11-251-2/+8
| * | | Allow QDial to wrap value when wrapping property is set.Andy Nichols2010-11-253-1/+80
| * | | QtScript variant conversion: Convert numbers to (u)int if applicable (reviewe...Thomas Senyk2010-11-252-1/+7
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-25292-6035/+21775
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-252-0/+8
| |\ \ \
| | * \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
| | |\ \ \
| | | * \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
| | | |\ \ \
| | | | * \ \ Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-11-242-0/+8
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-242-0/+8
| | | | | |\ \ \
| | | | | | * | | Fix compliation of ALSA audio backend when checking for surround support.Justin McPherson2010-11-242-0/+8
| | | | | |/ / /
| * | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-25290-6035/+21767
| |\ \ \ \ \ \ \ | | |/ / / / / /