summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixes QSqlThread autotestBill King2010-03-101-3/+3
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-03-104-0/+111
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-093-19/+15
| |\
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-094-0/+111
| |\ \
| | * | fix qm file installation from shadow buildOswald Buddenhagen2010-03-091-0/+1
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-093-0/+110
| | |\ \ | |/ / /
| | * | Added very simple JPEG loading benchmark (using QImageReader)Markus Goetz2010-03-093-0/+110
* | | | Parallelize DB autotests, also some factorizationBill King2010-03-1010-698/+738
| |_|/ |/| |
* | | Compile without QT3_SUPPORTAnders Bakken2010-03-091-2/+2
* | | Improve scrolling in DirectFBAnders Bakken2010-03-092-17/+13
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-092-2/+3
|\ \ | |/ |/|
| * Memory leak!Gabriel de Dietrich2010-03-091-1/+2
| * Cursor would remain in a non-focused QLineEdit after clearing its selectionGabriel de Dietrich2010-03-091-1/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-091-1/+37
|\ \ | |/ |/|
| * Get the printDialog to check for default paperSize via CUPSPierre Rossi2010-03-091-1/+37
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-091-0/+10
|\ \ | |/ |/|
| * QGraphicsSceneEvent: add Q_DISABLE_COPYOlivier Goffart2010-03-091-0/+10
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-092-6/+6
|\ \ | |/ |/|
| * Fix obsolete URL's.Jason McDonald2010-03-092-6/+6
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-081-0/+2
|\ \ | |/ |/|
| * Don't use DirectFB for non-existing pixmapsAnders Bakken2010-03-081-0/+2
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-0813-6/+124
|\ \ | |/ |/|
| * QXmlSchema internals: include/import/redefine schemas only oncePeter Hartmann2010-03-0813-6/+124
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-082-2/+2
|\ \ | |/ |/|
| * remove unneeded function pointer in qmenu_wince.cppJoerg Bornemann2010-03-081-1/+0
| * Updated the QCursor docs regarding XOR'ed cursors.Trond Kjernåsen2010-03-081-1/+2
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-081-1/+1
|\ \
| * | QHostInfo: Compile fixMarkus Goetz2010-03-081-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-081-7/+10
|\ \ \ | | |/ | |/|
| * | Fix undocked widgets not being restored correctly as part of the layoutThierry Bastian2010-03-081-7/+10
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-081-2/+2
|\ \ \ | |/ /
| * | Prevent QRegion from crashing on large coordinates.Samuel Rødal2010-03-081-2/+2
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-082-2/+16
|\ \ \ | |/ /
| * | QTableView: fix navigating with keyboard with spans not scrollingOlivier Goffart2010-03-082-2/+16
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-051-8/+24
|\ \ | |/ |/|
| * Compile with DirectFB version >= 1.2.0 && < 1.2.9Anders Bakken2010-03-051-1/+1
| * QDirectFBPaintEngine optimizationAnders Bakken2010-03-051-3/+4
| * Add some warnings when using DISABLE/WARN in DFBAnders Bakken2010-03-051-4/+19
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-0515-51/+216
|\ \ | |/ |/|
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-0515-51/+216
| |\
| | * Fix build with Mesa 7.8's EGL implementatioonBernhard Rosenkraenzer2010-03-051-3/+3
| | * Reset the byte order in the iconv codec after using it.Thiago Macieira2010-03-051-12/+29
| | * fix "using namespace" recursion crashOswald Buddenhagen2010-03-053-8/+104
| | * Fixed key mappings on X11Denis Dzyubenko2010-03-052-20/+20
| | * QDom: prevent infinite loop when cloning a DTDPeter Hartmann2010-03-052-0/+26
| | * QPrintPreviewDialog number of pages is partially blocked from view in OSXCarlos Manuel Duclos Vergara2010-03-051-0/+13
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-055-8/+21
| | |\
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-055-8/+21
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-055-21/+141
|\ \ \ \ | |/ / / |/| | |
| * | | Compile fix for Windows Mobile and OpenGLES2ninerider2010-03-051-3/+1