summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Extend the detection of CPU feature for x86Benjamin Poulain2010-07-192-1/+17
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-07-1952-793/+490
| |\ \ \ \ \
| * | | | | | Remove some more unneeded files from libjpeg, avoiding GPLaavit2010-07-192-775/+0
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-191-1/+18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | Do image comparison with fuzzHarald Fernengel2010-07-191-1/+18
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1932-714/+395
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1932-714/+395
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Convert examples and demos to use Bearer Management.Aaron McCarthy2010-07-1924-711/+388
| | * | | | Fixes deployment rules for embedded qml demos application.Aaron McCarthy2010-07-197-0/+7
| | * | | | Fix build on Symbian.Aaron McCarthy2010-07-191-3/+0