summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-30263-1771/+4239
|\
| * Moc: fix compilation when templated types with multiple arguments are used.Olivier Goffart2010-06-303-4/+28
| * Fixes the documentation of QGraphicsEffect::update().Yoann Lopes2010-06-301-6/+3
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-06-302411-54171/+52001
| |\
| | * Avoid calling time.elapsed() twice in abstract animationLeonardo Sobral Cunha2010-06-302-3/+4
| | * Adds slowdownFactor to UnifiedTimer in abstract animationLeonardo Sobral Cunha2010-06-302-4/+16
| | * Add the conversion in-place for QPixmap::fromImageReader() on raster.Benjamin Poulain2010-06-304-0/+73
| | * Add QPixmap::fromImageReader() to decode arbitrary images in place.Benjamin Poulain2010-06-304-1/+35
| | * Add missing license header.Jason McDonald2010-06-301-0/+41
| | * Fixed a crash in menubar with invisible actionsThierry Bastian2010-06-302-1/+30
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-3040-193/+645
| | |\
| | | * Fixed ARM .def files.Rohan McGovern2010-06-301-0/+5
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2939-193/+640
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2939-193/+640
| | | | |\
| | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-291927-48052/+40091
| | | | | |\
| | | | | | * Made -graphicssystem trace work with Qt::TextBypassShaping flag.Samuel Rødal2010-06-293-4/+4
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2935-186/+633
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2835-186/+633
| | | | | | | |\
| | | | | | | | * Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0Benjamin Poulain2010-06-281-1/+1
| | | | | | | | * Add a manual test for regular widget interaction with the table.Benjamin Poulain2010-06-282-0/+112
| | | | | | | | * New variant of ::createPixmapData with origin for QGraphicsSystem.Michael Dominic K2010-06-283-1/+6
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2730-185/+515
| | | | | | | | |\
| | | | | | | | | * EGL plane levels are the same as all other GL backends.Trond Kjernåsen2010-06-251-1/+1
| | | | | | | | | * Need to access extensionFuncs in subclasses too.Michael Dominic K2010-06-252-1/+8
| | | | | | | | | * Export QGLWindowSurface too.Michael Dominic K2010-06-251-1/+1
| | | | | | | | | * Export the QGLPixmapData so that we can override it in a custom graphics system.Michael Dominic K2010-06-251-1/+1
| | | | | | | | | * Fixed autotest failure in QPathClipper on N900.Samuel Rødal2010-06-252-34/+18
| | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2523-147/+486
| | | | | | | | | |\
| | | | | | | | | | * Fixed autotest failure in QPainter::setOpacity when NEON is used.Samuel Rødal2010-06-251-6/+10
| | | | | | | | | | * Fix compilation when configured with -no-xrenderGunnar Sletta2010-06-251-1/+1
| | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2421-140/+475
| | | | | | | | | | |\
| | | | | | | | | | | * Add a new (internal) flag QGraphicsItem::ItemStopsClickFocusPropagation.Bjørn Erik Nilsen2010-06-245-4/+69
| | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2416-136/+406
| | | | | | | | | | | |\
| | | | | * | | | | | | | Doc: QSettings::sync() imports changes made by other processes.Geir Vattekar2010-06-291-3/+3
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-301-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge commit 'staging/4.7' into qt-3541Aaron McCarthy2010-06-3078-149/+195
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2973-147/+168
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fixed deployment paths for WebKit declarative plugin.axis2010-06-291-1/+1
| | | * | | | | | | | | | | Fix s60main linking issue with gcce applicationsMiikka Heikkinen2010-06-291-0/+4
| | | * | | | | | | | | | | Merge branch 'buildSystemFixes' into 4.7-s60axis2010-06-2971-142/+163
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-293-6/+7
| | | | * | | | | | | | | | | Fixed a relative path problem in qml demos.axis2010-06-297-7/+7
| | | | * | | | | | | | | | | Added the APP_PRIVATE_DIR_BASE variable.axis2010-06-291-1/+2
| | | | * | | | | | | | | | | Various fixes to autotests when using the symbian/linux-armcc mkspec.axis2010-06-2958-65/+81
| | | | * | | | | | | | | | | Fixed Symbian resources not honoring TARGET with a path.axis2010-06-292-63/+66
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-291-4/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Removed useless comments.axis2010-06-291-4/+0
| | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |