summaryrefslogtreecommitdiffstats
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-2299-1903/+2069
|\
| * Merge branch 'master' of git:qt/qtThiago Macieira2010-02-21783-70029/+58894
| |\
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2099-1903/+2069
| |\ \
| | * | 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-20783-16234/+102449
| | |\ \
| | * | | 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-1956-98/+228
| | |\ \ \
| | | * | | 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-19628-2756/+4279
| | | | |\ \ \
| | | | * | | | 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
| | | | |/ / / | | | |/| | |
| | | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-199-845/+1258
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1913-851/+1329
| | | | |\ \ \ \
| | | * | | | | | qdoc: Finished "Inherited by" list for QML elements.Martin Smith2010-02-196-35/+44
| | * | | | | | | Doc: Collected the Declarative UI tutorials together and renamed them.David Boddie2010-02-1912-777/+498
| | * | | | | | | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-1918-192/+23
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | 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 git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1817-106/+270
| | |\ \ \ \ \
| | * | | | | | qdoc: Added "Inherited by" list to QML elements.Martin Smith2010-02-185-10/+76
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-221-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
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | 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 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-2117-553/+204
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-219-258/+100
| * | | | | | | | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-2113-297/+106
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-21302-68221/+34221
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20302-68221/+34221
| |\ \ \ \ \ \ \ \ |/ / / / / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-20356-6032/+7175
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20302-68220/+34223
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Compile fix for symbianaavit2010-02-201-5/+2
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'rtiff392'aavit2010-02-20170-62706/+9373
| |\ \ \ \ \ \ \ \
| | * | | | | | | | license doc updated for libtiff 3.9.2aavit2010-02-161-39/+78
| | * | | | | | | | Our configuration and build modifications to libtiffaavit2010-02-166-1/+454