summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-2134-77/+113
|\
| * Revert "Compile fix for MSVC"Robert Loehning2010-07-211-2/+1
| * Compile fix for MSVCRobert Loehning2010-07-211-1/+2
| * Improve QAccessible for QAccessibleTabBarSebastian Sauer2010-07-211-2/+6
| * Improve QAccessible for QTabBarSebastian Sauer2010-07-211-0/+6
| * fix the export macros for the QtDBus moduleRomain Pokrzywka2010-07-2127-71/+71
| * rebuild configure.exeJoerg Bornemann2010-07-211-0/+0
| * make "configure -qt-gif" work again on WindowsJoerg Bornemann2010-07-211-2/+2
| * Fix a typo in harfbuzz thai line breaking.Ritt Konstantin2010-07-211-1/+1
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-07-2121-917/+164
| |\
| * | Ensure that font sizes that are > 0 and < 1 are still respectedAndy Shaw2010-07-212-1/+27
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-2125-15/+584
|\ \ \
| * | | Use aligned load for the blending of RGB32 over RGB32Benjamin Poulain2010-07-211-2/+12
| * | | 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 '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-2111-131/+246
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-218-115/+230
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed the definitions of file locations on Symbian using configure.shaxis2010-07-211-86/+101
| | * | | | | | | | | Added automatic sqlite extraction for Symbian to QtWebKit.axis2010-07-211-2/+10
| | * | | | | | | | | Fixed automatic sqlite extraction on Symbian makefile build system.axis2010-07-214-1/+42
| | * | | | | | | | | Removed the need to specify -arch symbian when compiling on Linux.axis2010-07-212-2/+4
| | * | | | | | | | | Fixed QT_NO_FREETYPE define.axis2010-07-212-2/+1
| | * | | | | | | | | Various configure fixes to make Qt compile with Raptor on Linux.axis2010-07-211-24/+81
| * | | | | | | | | | Made developer builds use the build dir as prefix, also on Symbian.axis2010-07-211-14/+10
| * | | | | | | | | | Added missing header to qstring.cpp.axis2010-07-211-0/+4
| * | | | | | | | | | Fixed a parsing error during sis and runonphone target creation.axis2010-07-212-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-2139-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Minor modification to allow compilation on WinCE and AIX. Removed executable ...Toby Tomkins2010-07-2139-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | 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