summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-176-7/+52
|\
| * Don't do opaque detection when copying a sub-rect of a QPixmap.Samuel Rødal2010-06-171-1/+1
| * Optimized QPixmap::fromImage for raster pixmaps.Samuel Rødal2010-06-171-3/+16
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-17243-5030/+7796
| |\
| | * Typo in qcleanlooksstyle.cppOlivier Goffart2010-06-171-1/+1
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-17242-5029/+7795
| | |\
| | | * Speed up calls to QPainter::setCompositionMode when the mode is unchangedSimon Hausmann2010-06-171-0/+2
| * | | Doc: Small change to QAbstractItemDelegate::editorEvent()Geir Vattekar2010-06-171-2/+8
| |/ /
| * | Doc: Specified QAbstractEventDispatcher::filterEvent()'s argument types.Geir Vattekar2010-06-171-0/+24
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1726-67/+623
|\ \ \
| * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-179-22/+263
| |\ \ \
| | * | | Usefully convert from QtScript object/array to QVariantKent Hansen2010-06-178-22/+257
| | * | | document QSslSocket::systemCaCertificates() change in changelogPeter Hartmann2010-06-171-0/+6
| * | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-172-11/+105
| |/ / /
| * | | Implement QIODevice::peek() using read() + ungetBlock().Andreas Kling2010-06-162-7/+23
| * | | Allocate the memory for QtFontSize when count > 1Benjamin Poulain2010-06-161-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1615-38/+243
| |\ \ \
| | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1666-530/+733
| | |\ \ \
| | | * | | Defer allocation of GIF decoding tables/stack.Andreas Kling2010-06-161-2/+12
| | | * | | Make sure only started gestures can cause cancellationsThomas Zander2010-06-161-1/+2
| | | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-163-10/+29
| | | * | | qmake: Fix CONFIG += exceptions_off with the MSVC project generator.Jocelyn Turcotte2010-06-162-2/+6
| | | * | | Fix some kind of race condition while using remote commands.kh12010-06-162-2/+24
| | | * | | Work around ICE in Intel C++ Compiler 11.1.072Thiago Macieira2010-06-161-1/+1
| | | * | | Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
| | * | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-164-16/+160
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-174-7/+56
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-164-7/+56
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Provide 'make unsigned_sis' target for Symbian mkspecsMiikka Heikkinen2010-06-164-7/+56
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1723-134/+260
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | doc: add note that items with width or height of 0 are not positioned.Martin Jones2010-06-171-0/+8
| * | | | | | Add test for model data changes.Martin Jones2010-06-172-2/+47
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-17168-4302/+6414
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1619-131/+203
| | |\ \ \ \ \ \
| | | * | | | | | Fix the N900 device orientation backendHarald Fernengel2010-06-162-68/+56
| | | * | | | | | Micro cleanupHarald Fernengel2010-06-161-4/+3
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-1655-487/+642
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-161-0/+1
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-167-15/+64
| | | * | | | | | | | Write TextInput.positionToRectangle docs.Alan Alpert2010-06-162-4/+10
| | | * | | | | | | | Minor demo fixesAlan Alpert2010-06-162-4/+7
| | | * | | | | | | | Fix autoScroll implementationAlan Alpert2010-06-163-36/+54
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-15662-10770/+30515
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Enhance docsAlan Alpert2010-06-031-0/+3
| | | * | | | | | | | | Slight addition to the docs.Alan Alpert2010-06-011-0/+5
| * | | | | | | | | | | clearFocus() shouldn't mess with focus if it doesn't have focusMartin Jones2010-06-171-1/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1647-472/+577
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Stopping a flick resulted in the next click being consumed.Martin Jones2010-06-161-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-179-39/+99
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping setTor Arne Vestbø2010-06-161-1/+2