summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-0110-20/+912
|\
| * Placate pedantic compiler warning modes on QGLBufferRhys Weatherley2010-02-012-15/+15
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Rhys Weatherley2010-02-0147-574/+670
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-018-16/+892
| | |\
| * | | Promote QPixmap::convertFromImage() to public API from Qt3SupportRhys Weatherley2010-02-012-4/+20
| | |/ | |/|
| * | Add the QGLBuffer class to Qt 4.7 for VBO'sRhys Weatherley2010-02-018-16/+892
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0154-356/+735
|\ \ \ | |_|/ |/| |
| * | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-01354-6151/+10886
| |\ \
| | * \ Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into inte...David Boddie2010-01-293-1/+209
| | |\ \
| | | * | Fix build due to missing auto-generated files on dbus exampleAdemar de Souza Reis Jr2010-01-292-0/+208
| | | * | examples/dbus: update remotecontrolledcar exampleAdemar de Souza Reis Jr2010-01-299-239/+26
| | | * | examples/dbus: update dbus-chat adaptor/interface filesAdemar de Souza Reis Jr2010-01-294-26/+23
| | | * | doc: Fix typo in QEvent::ignore() documentationAdemar de Souza Reis Jr2010-01-291-1/+1
| | | * | doc: Fix qmake-manual warn_on/warn_off referencesAdemar de Souza Reis Jr2010-01-291-2/+2
| | * | | Use X/Open LFS extensions for 64-bit support on directory iterationJoão Abecasis2010-01-295-26/+54
| | * | | nano-optimizationsRitt Konstantin2010-01-291-10/+4
| | * | | code cleanup and styling fixesRitt Konstantin2010-01-292-159/+108
| | * | | QDirPrivate: remove unused q_ptr and Q_DECLARE_PUBLICRitt Konstantin2010-01-291-13/+8
| | * | | QDir: clear internal file lists cache earlyRitt Konstantin2010-01-291-4/+3
| | * | | QDirPrivate::setPath: always initialize the file engineRitt Konstantin2010-01-291-9/+4
| | * | | optimize QDir::cd()Ritt Konstantin2010-01-291-7/+6
| | * | | QDirPrivate::Data: remove needless clear()-s in constructorsRitt Konstantin2010-01-291-5/+4
| | * | | QDir::cleanPath: strip trailing slash for "/:/" on non-win platformsRitt Konstantin2010-01-292-3/+13
| | * | | QDir::entry(Info)List(): really use cached dataRitt Konstantin2010-01-291-2/+6
| | * | | Fix QDir::operator[] documentationRitt Konstantin2010-01-291-4/+1
| * | | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-019145-21480/+43400
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-227-7/+52
| | |\ \ \ \
| | | * | | | Move avkon component transparency check to app initialization.Jani Hautakangas2010-01-224-34/+23
| | | * | | | Fix for symbian dialog background transparency.Jani Hautakangas2010-01-226-7/+63
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-224-7/+7
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-224-7/+7
| | | |\ \ \ \ \ | | |/ / / / / /
| | | * | | | | Assistant docs: Fix link.ck2010-01-211-1/+1
| | | * | | | | QtHelp docs: Fix illegal namespace name.ck2010-01-212-2/+2
| | | * | | | | Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2220-43/+116
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | QSslSocket: Take better care on how we use the SSL buffersMarkus Goetz2010-01-211-3/+23
| | | * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-214-3/+27
| | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2113-30/+41
| | | |\ \ \ \ \
| | | | * | | | | Revert "Make an empty QUrl also be considered non-detached (d == 0)."Thiago Macieira2010-01-212-21/+1
| | | | * | | | | SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLFThiago Macieira2010-01-215-4/+22
| | | | * | | | | QNAM HTTP: make it give some better error messages in case of socket failure.Thiago Macieira2010-01-213-5/+7
| | | | * | | | | qUncompress: Fix terminating \0Markus Goetz2010-01-212-0/+10
| | | | * | | | | Add qttracereplay.exe to gitignoreMarkus Goetz2010-01-211-0/+1
| | | * | | | | | doc: Documented the return value for QDomNode::appendChild().Martin Smith2010-01-211-4/+8
| | | |/ / / / /
| | | * | | | | Fix missing focus rect for check and radio buttons in some GTK+ themesJens Bache-Wiig2010-01-211-3/+17
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-2112-57/+141
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Update symbian def filesShane Kearns2010-01-216-6/+26
| | | * | | | | Merge from upstreamShane Kearns2010-01-213-23/+45
| | | * | | | | Merge from upstreamShane Kearns2010-01-213-22/+33
| | | * | | | | Fix pro file error affecting windows buildsShane Kearns2010-01-211-1/+1