summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tst_moc: workaround gcc bug.Olivier Goffart2010-07-211-4/+7
* Some more change to the changelogOlivier Goffart2010-07-211-1/+8
* Fix compilation with QT_NO_GRAPHICSVIEWTasuku Suzuki2010-07-211-0/+8
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-2123-12/+553
|\
| * Updates changes-4.7.0Charles Yin2010-07-211-1/+7
| * Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET.Charles Yin2010-07-211-1/+33
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-2021-10/+513
| |\
| | * Add a missing file in the config.test for SSE 4.2Benjamin Poulain2010-07-201-0/+3
| | * Remove the masking when computing qAlpha()Benjamin Poulain2010-07-201-1/+1
| | * Add support for more vector instructions on x86Benjamin Poulain2010-07-2012-1/+386
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-207-8/+123
| | |\
| | | * Workaround gcc bug, disable test with old version of gccOlivier Goffart2010-07-201-0/+4
| | | * Merge branch 'QTBUG-6843' into 4.7Jan-Arve Sæther2010-07-201-2/+2
| | | |\
| | | | * Do not crash due to a infinite recursion when using voiceover on MacOSJan-Arve Sæther2010-07-201-2/+2
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-07-202-1/+79
| | | |\ \
| | | | * | QGraphicsItem: Animation leaves drawing artifacts when clipping is used.Bjørn Erik Nilsen2010-07-202-1/+79
| | | * | | doc: Fix qdoc errors for text related filesEskil Abrahamsen Blomfeldt2010-07-202-4/+2
| | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-202-1/+36
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-202-1/+36
| | | | |\ \
| | | | | * | moc: Slot with complex template default value does not compileOlivier Goffart2010-07-192-1/+36
* | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-07-2114-1533/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-2014-1533/+2
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-2014-1517/+2
| |\ \ \ \ \ \
| | * | | | | | Revert "Add the chart utility from qtestlib-tools."Rohan McGovern2010-07-2014-1517/+2
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-197-96/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove references to files removed by previous commit.Jason McDonald2010-07-192-8/+0
| | * | | | | | Remove files as instructed by Legal department.Jason McDonald2010-07-196-88/+0
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-203-27/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Removed some translationsRobert Loehning2010-07-201-24/+0
| * | | | | | | doc: Fixed typos in QAbstractFileEngineIteratorRobert Loehning2010-07-201-3/+3
| * | | | | | | Updated changelog for 4.7.Yoann Lopes2010-07-201-0/+5
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-202-9/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Added missing deployment to autotest.axis2010-07-201-1/+4
| * | | | | | | | Fixed some deployment issues on Symbian.axis2010-07-201-2/+1
| * | | | | | | | Fixed a QSplashScreen hanging bug in S60 3.1 devices.axis2010-07-201-6/+14
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-205-8/+102
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | My 4.7.0 changesEskil Abrahamsen Blomfeldt2010-07-201-5/+52
| * | | | | | Fix a Headerview layout bugPierre Rossi2010-07-202-1/+22
| * | | | | | Qt does not build with qt_namespace on macosCarlos Manuel Duclos Vergara2010-07-201-2/+2
| * | | | | | Add a testcase for when peeking and then reading from a QIODeviceAndy Shaw2010-07-201-0/+26
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-207-96/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | Remove some files as instructed by Legal department.Jason McDonald2010-07-207-96/+0
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1911-10/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1911-10/+14
| |\ \ \ \ \ |/ / / / / /
| * | | | | Check in the correct configure.exeDaniel Molkentin2010-07-191-0/+0
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1911-10/+14
| |\ \ \ \ \
| | * | | | | Examples: Fix compilation with namespace.ck2010-07-198-8/+10
| | * | | | | Rebuilt configure.exeDaniel Molkentin2010-07-191-0/+0
| | * | | | | Make configure.exe accept -no-gif again, fix commentDaniel Molkentin2010-07-192-2/+4
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-194-776/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |