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-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
| | | |\
| | | | * Fixed some potential index-out-of-bounds issues in QImage.Kim Motoyoshi Kalland2010-06-242-6/+24
| | | | * Fixed autotest failure in fillRect_stretchToDeviceModeSamuel Rødal2010-06-241-1/+1
| | | | * Adding a known issue for VC2010 64 bitThierry Bastian2010-06-241-0/+8
| | | | * Added a note to desupport VC2010 64-bitThierry Bastian2010-06-241-2/+4
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2412-128/+370
| | | | |\
| | | | | * Normalize integers when calling glVertexAttribPointer()Rhys Weatherley2010-06-241-2/+2
| | | | | * Add an implementation of comp_func_solid_SourceOver_neon() with Neon.Benjamin Poulain2010-06-233-0/+46
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-239-126/+322
| | | | | |\
| | | | | | * Fix the casts of qdrawhelper_sse2Benjamin Poulain2010-06-231-4/+4
| | | | | | * Add a SSE2 implementation of comp_func_solid_SourceOver()Benjamin Poulain2010-06-232-2/+33
| | | | | | * Add a SSE2 version of comp_func_SourceOver()Benjamin Poulain2010-06-232-61/+116
| | | | | | * Fixed missing copy of raster pixmap data after change fb76a872e20bd.Samuel Rødal2010-06-232-0/+6
| | | | | | * Fixed QPixmap::toImage() bug introduced in fb76a872e20bd.Samuel Rødal2010-06-231-0/+10
| | | | | | * Optimized sub-rect copying / painting of QPixmaps.Samuel Rødal2010-06-237-62/+152
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-231-1/+5
| | | | | | |\
| | | | | | | * Fixed crash in the fast blend functions for rasterGunnar Sletta2010-06-231-1/+5
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2622-532/+454
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fixed copy-paste error in htmlgenerator.cppRohan McGovern2010-06-261-1/+1
| * | | | | | | Corrected filename case for wincrypt.hMark Brand2010-06-261-1/+1
| * | | | | | | Add qDebug() operator for QGLFormatHarald Fernengel2010-06-252-0/+33
| * | | | | | | Fix conversion between JavaScript Date and QDateTimeKent Hansen2010-06-256-427/+53
| * | | | | | | Avoid memory allocation when converting from Gbk to unicode.Benjamin Poulain2010-06-251-6/+15
| * | | | | | | Warn if surface creation failsHarald Fernengel2010-06-251-1/+4
| * | | | | | | Doc: fixing search bugMorten Engvoldsen2010-06-252-3/+15
| * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-253-11/+61
| |\ \ \ \ \ \ \
| | * | | | | | | QSemaphore::tryAquire(timeout) -- never times out on an active semaphoreBradley T. Hughes2010-06-252-3/+53
| | * | | | | | | Fix warnings in QSslSocketPrivate::systemCaCertificates()Zeno Albisser2010-06-251-8/+8
| * | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-252-8/+66
| |/ / / / / / /
| * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-25204-8078/+4866
| |\ \ \ \ \ \ \
| * | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-255-76/+207
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2518-43/+656
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Use custom static scopes to improve QML/JavaScript performanceKent Hansen2010-06-2514-37/+652
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-254-6/+4
| |\ \ \ \ \ \ \ |/ / / / / / / /
| * | | | | | | qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.Jocelyn Turcotte2010-06-244-6/+4
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2417-141/+280
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06Simon Hausmann2010-06-2415-128/+274
| * | | | | | | Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-243-14/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-245-10/+41
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |