summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-2622-277/+316
|\
| * Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-2622-277/+316
| |\
| | * Support to build Qt for Symbian on Mac OS X with gcce compiler.Liang Qi2010-10-262-83/+77
| | * Fixed library and header definitions for Symbian builds on Linux.axis2010-10-212-4/+8
| | * Got rid of some "duplicate library" warnings.axis2010-10-211-1/+1
| | * Added wrapper for the elf2e32_qtwrapper script.axis2010-10-213-145/+151
| | * Changed various qmake constructs to support Windows.axis2010-10-213-11/+36
| | * Fixed various quotation problems when porting to Windows.axis2010-10-212-8/+13
| | * Fixed some preprocessor parameters for Mac support.axis2010-10-211-4/+4
| | * Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-217-57/+48
| | * Added detection of bat files to the qtPrepareTool function.axis2010-10-211-1/+7
| | * Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-2112-23/+23
| | * Fixed library ordering when linking to qtmain.axis2010-10-211-2/+7
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-261-1/+20
|\ \ \ | |/ / |/| |
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-1/+20
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-261-1/+20
| | |\ \
| | | * | Remove qdrawhelper_arm_simd.cpp dependency to u32std.hJani Hautakangas2010-10-261-1/+20
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-268-33/+33
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-268-33/+33
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-268-33/+33
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Run util/normalize on src/declarative.Yann Bodson2010-10-268-33/+33
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-264-49/+46
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-264-49/+46
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-264-49/+46
| | |\ \ \
| | | * | | Phonon MMF backend: removed redundant trace outputGareth Stockwell2010-10-251-14/+0
| | | * | | qmediaplayer: added command-line switch for initial volumeGareth Stockwell2010-10-253-35/+46
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-2614-114/+405
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2614-114/+405
| |\ \ \ \ \ |/ / / / / / | | _ / / / | | / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2514-114/+405
| |\ \ \ \
| | * | | | Simplify calculation of center point and scale for PinchRecongizerFrederik Gladhorn2010-10-251-11/+8
| | * | | | Doc: Fixing typoSergio Ahumada2010-10-255-10/+10
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2411-101/+395
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2311-101/+395
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2211-101/+395
| | | | |\ \ \ \
| | | | | * | | | QtDFB: Make transparent windows behave betterAnders Bakken2010-10-223-17/+29
| | | | | * | | | For meego graphics system, use floyd-steinberg dithering when converting to 1...Michael Dominic K2010-10-223-24/+278
| | | | | * | | | Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-225-60/+88
* | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-2698-551/+4376
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-0/+38
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-251-0/+38
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | add autotest for QString::setRawData()Oswald Buddenhagen2010-10-251-0/+38
| * | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2597-551/+4338
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-2597-551/+4338
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-241-3/+11
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2312-34/+213
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2222-414/+522
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-217-16/+138
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-20100-4149/+3851
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-20102-1594/+2872
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fixed case of a library file name to enable MinGW builds on Fedora.David Boddie2010-10-201-2/+2