summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-221-1/+1
|\
| * Don't include private headers from public headers.Morten Johan Sørvig2010-02-221-1/+1
* | doc: Fixed some qdoc errors.Martin Smith2010-02-225-10/+10
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2266-926/+1462
|\
| * Merge branch 'master' of git:qt/qtThiago Macieira2010-02-21399-68675/+37844
| |\
| * | Fix compilation on HP-UXi: m_volume is a #defineThiago Macieira2010-02-206-20/+20
| * | WinCE doesn't have sys/types.hThiago Macieira2010-02-201-1/+1
| * | Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT...Thiago Macieira2010-02-202-2/+2
| * | Fix compilation on recent Linux systems: getpid(2) is in unistd.h.Thiago Macieira2010-02-201-0/+2
| * | Merge remote branch 'origin/master'Thiago Macieira2010-02-20487-12279/+86567
| |\ \
| * | | Cocoa: calling QEventLoop::exec from mouse up causes problemRichard Moe Gustavsen2010-02-191-0/+1
| * | | Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)Thiago Macieira2010-02-191-1/+5
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-1949-59/+179
| |\ \ \
| | * | | Work around MSVC2008 compiler crashKent Hansen2010-02-192-1/+27
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-192-40/+36
| | |\ \ \
| | | * | | Cocoa: event dispatcher eats mouse eventsRichard Moe Gustavsen2010-02-191-39/+35
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Fabien Freling2010-02-19344-1571/+2104
| | | |\ \ \
| | | * | | | Fix an issue about double-click on Mac OS X.Fabien Freling2010-02-191-1/+1
| | * | | | | doc: Added "\since 4.7" to a bunch of declarative stuff.Martin Smith2010-02-1945-18/+116
| | | |/ / / | | |/| | |
| * | | | | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-191-3/+0
| |/ / / /
| * | | | Avoid calling out to public API in the QtScript implementationKent Hansen2010-02-188-359/+513
| * | | | Move property helper functions to QScriptEnginePrivateKent Hansen2010-02-184-206/+288
| * | | | Move more script value conversion code to helper functionsKent Hansen2010-02-182-65/+152
| * | | | Cleanup: Move value conversion code to helper functionsKent Hansen2010-02-183-11/+60
| * | | | Move implementation of QScriptValue construction functions to private classKent Hansen2010-02-182-91/+133
| * | | | Cleanup: Move number conversion functions to QScriptEnginePrivateKent Hansen2010-02-183-84/+81
| * | | | Move some helper function declarations outside QT_NO_QOBJECT guardKent Hansen2010-02-181-13/+14
| * | | | Cleanup: Move exception helper functions to QScriptEnginePrivateKent Hansen2010-02-183-35/+35
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-211-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-211-1/+1
| |\ \ \ \
| | * | | | QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.Daniel Molkentin2010-02-211-1/+1
| | | |_|/ | | |/| |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20301-68181/+34136
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-20124-1985/+3019
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20301-68180/+34138
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Compile fix for symbianaavit2010-02-201-5/+2
| | |/ / / | |/| | |
| * | | | Merge branch 'rtiff392'aavit2010-02-20169-62667/+9295
| |\ \ \ \
| | * | | | Our configuration and build modifications to libtiffaavit2010-02-166-1/+454
| | * | | | Add libtiff 3.9.2aavit2010-02-16209-0/+68942
| | * | | | Delete libtiff 3.8.2aavit2010-02-11243-122767/+0
| * | | | | Merge branch 'rjpeg8'aavit2010-02-20132-5513/+24843
| |\ \ \ \ \
| | * | | | | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-162-5/+10
| | * | | | | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53
| | * | | | | Add libjpeg 8aavit2010-02-16137-0/+53170
| | * | | | | Delete libjpeg 6baavit2010-02-1690-33896/+0
* | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-20487-12273/+86562
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1921-70/+259
| |\ \ \ \ \ \
| | * | | | | | Add convenience function QTextCursor::positionInBlock()mae2010-02-192-1/+26
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1819-69/+233
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | optimize qstring::simplified()Oswald Buddenhagen2010-02-181-16/+66
| | | * | | | | Revert optimizations to QString::appendKai Koehne2010-02-182-42/+4