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-07-279-86/+302
|\
| * Implement the composition mode "Plus" with SSE2Benjamin Poulain2010-07-274-9/+94
| * Clean the CompositionFunction tables of drawhelperBenjamin Poulain2010-07-277-77/+208
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2710-16/+47
|\ \
| * | Document that animations have to be started/stopped as a groupBea Lam2010-07-271-0/+8
| * | various doc fixesBea Lam2010-07-278-16/+14
| * | Document 'this' as undefined in QMLMartin Jones2010-07-271-0/+25
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-271-3/+7
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-261-3/+7
| |\
| | * update changelog for 4.7.0Peter Hartmann2010-07-261-3/+7
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-2613-12/+182
|\ \ \ | |/ / |/| |
| * | Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590Simon Hausmann2010-07-2613-12/+182
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-2634-56/+588
|\ \ \ | |/ / |/| |
| * | Do check after all if we have partialUpdateSupport.Michael Dominic K2010-07-261-4/+3
| * | QDeclarativeEngineDebugServer: Fix crash when trying to update non-properties.Olivier Goffart2010-07-261-16/+14
| * | Doc: use const& in foreach when applicable.Olivier Goffart2010-07-2615-23/+23
| * | QGLBuffer::bind()/release() should not be const functions.Trond Kjernåsen2010-07-262-4/+4
| * | Use SSSE3 to convert from RGB888 to RGB32Benjamin Poulain2010-07-267-1/+301
| * | Extend the build system to SSSE3Benjamin Poulain2010-07-262-0/+41
| * | CPU feature detection for x86_64Andreas Kling2010-07-261-0/+67
| * | Use the appropriate CPUID bitmap for detecting SSE3 etcAndreas Kling2010-07-261-6/+9
| * | Skip tst_QLineEdit::QTBUG697_paletteCurrentColorGroup on non-x11Olivier Goffart2010-07-261-0/+3
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-255-2/+123
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-235-2/+123
| | |\ \
| | | * | Stabilize tst_qlineedit.cppOlivier Goffart2010-07-231-9/+17
| | | * | QScriptEngineAgent: ensure that the top of the backtrace is correct in excep...Olivier Goffart2010-07-232-0/+86
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-233-2/+29
| | | |\ \
| | | | * | Fix QLineEdit's Highlight color when inactive.Pierre Rossi2010-07-233-2/+29
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-266-21/+172
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | My changes for 4.7.0.axis2010-07-261-2/+20
| * | | | fixed QDBUS export errorEvan Nguyen2010-07-261-1/+1
| * | | | Q_INVOKABLES added to Qt-DBusEvan Nguyen2010-07-265-20/+153
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-252-1/+26
|\ \ \ \
| * | | | Drawer widget in a MainWindow disappears after returning from full screen mode.Carlos Manuel Duclos Vergara2010-07-232-1/+26
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Dummy commit to make the CI test againSimon Hausmann2010-07-250-0/+0
| * | | Fix quoting for module reading in qconfig.priSimon Hausmann2010-07-241-1/+1
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-232-27/+26
|\ \ \
| * | | qdoc: Cleaned up the TOC for QML element pages.Martin Smith2010-07-231-5/+11
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-2310-183/+558
| |\ \ \
| * | | | qdoc: Cleaned up the Inherits and Inherited by lines for QML elements.Martin Smith2010-07-231-22/+14
| * | | | doc: Added missing \since 4.7 to effect propertyu.Martin Smith2010-07-231-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-23101-788/+2008
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-23101-788/+2008
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Update QtDeclarative def filesJoona Petrell2010-07-232-6/+8
| | * | | | Fix crash in MouseAreaJoona Petrell2010-07-231-1/+2
| | * | | | CompileAaron Kennedy2010-07-231-6/+3
| | * | | | Fixes undeleted timers (and endless warning from the event loop aboutAaron Kennedy2010-07-231-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-2364-175/+483
| | |\ \ \ \
| | | * | | | Remove unneeded member variable.Michael Brasser2010-07-222-6/+3