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-09-016-7/+118
|\
| * Fix compiling issue for FreeType version earlier than 2.1.10Jiang Jiang2010-09-011-2/+9
| * Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().Trond Kjernåsen2010-09-011-1/+1
| * Use NEON and preloading for 16 bit small / medium sized image blits.Samuel Rødal2010-09-014-4/+108
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-016-73/+156
|\ \ | |/ |/|
| * Fix some missing proxy calles for CleanLooksJens Bache-Wiig2010-09-011-5/+5
| * Destroy QNetworkConfigurationManager global static from qApp dtor.Aaron McCarthy2010-09-011-1/+22
| * Fix EasyWLAN handling.Aaron McCarthy2010-09-014-67/+129
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0168-1518/+824
|\
| * Remove unused source files in designerVictor Ostashevsky2010-08-313-170/+1
| * make various POST_LINK steps nicerOswald Buddenhagen2010-08-315-23/+14
| * fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
| * fix windows build with -prefixOswald Buddenhagen2010-08-311-3/+5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-3159-1350/+824
| |\ |/ /
| * Update to the NTLM code.Thiago Macieira2010-08-311-19/+37
| * QTextEngine::LayoutData::reallocate musn't corrupt memoryJoão Abecasis2010-08-311-2/+5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-3157-1329/+782
| |\
| | * Updated Twitter demo in response to the new Twitter oauth requirementJens Bache-Wiig2010-08-3114-461/+332
| | * doc: Remove \internal tag from QScriptProgramKent Hansen2010-08-312-5/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-31107-1721/+7042
| | |\
| | | * QNetworkAccessManager doc: add since tag for added enumPeter Hartmann2010-08-311-1/+1
| | * | Doc: Reviewed updates to the model/view tutorial.David Boddie2010-08-311-454/+356
| | * | Merge branch '4.7' of ../msculls-modelview-qdoc-enhancement into 4.7David Boddie2010-08-3040-858/+541
| | |\ \
| | | * | fixed compilation problemRoland Wolf2010-07-302-7/+13
| | | * | Merge branch 'modelviewdoc' of scm.dev.nokia.troll.no:qt/msculls-modelview-qd...Roland Wolf2010-07-301-3/+3
| | | |\ \
| | | | * | problem: 2 images that were in raw html tables appeared smaller in konqueror ...Michael D Scull2010-07-291-3/+3
| | | * | | added missing filesRoland Wolf2010-07-304-0/+318
| | | * | | added missing filesRoland Wolf2010-07-302-0/+119
| | | |/ /
| | | * | moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8Roland Wolf2010-07-2940-1245/+485
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-315-12/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Undefined SSE symbols when crosscompiling Qt on PPC.Benjamin Poulain2010-08-315-12/+8
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-317-13/+50
|\ \ \ \ \
| * | | | | Fix gcce building of apps using static libraries in symbian-sbsv2Miikka Heikkinen2010-08-317-13/+50
| | |_|_|/ | |/| | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3115-62/+177
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Center and clip QML startup animation so it looks correct in fullscreenAaron Kennedy2010-08-311-41/+47
| * | | | Prevent calling deleteLater() from QMLAaron Kennedy2010-08-313-2/+26
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-3142-497/+5680
| |\ \ \ \ | | |/ / /
| * | | | Ignore non-scriptable properties in QMLAaron Kennedy2010-08-3113-19/+104
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-315-152/+283
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make tst_image a little bit more tollerent to rounding errorsOlivier Goffart2010-08-311-8/+8
| * | | | Clear the QGLWindowSurface in ::beginPaint when needed.Michael Dominic K2010-08-311-0/+14
| * | | | Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work.Samuel Rødal2010-08-311-5/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-313-142/+262
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-303-142/+262
| | |\ \ \ \
| | | * | | | Fix QStaticText with OpenGL1 engineEskil Abrahamsen Blomfeldt2010-08-301-1/+2
| | | * | | | tst_qimage: backport fix of commit 0d7e683 into 4.7Olivier Goffart2010-08-301-3/+3
| | | * | | | qdrawhelper: backport the optimisations in fetchTransformBilinear from master...Olivier Goffart2010-08-301-138/+257
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3161-1224/+2135
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-311-6/+6
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-310-0/+0
| | |\ \ \ \ \