summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-2712-16/+79
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2712-16/+79
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-272-2/+3
| | |\
| | | * Fix bug in QML debug client installationAaron Kennedy2010-10-271-1/+1
| | | * Doc clarification for Loader.Michael Brasser2010-10-271-1/+2
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-262-4/+4
| | |\
| | | * Set the location of the closing brace.Roberto Raggi2010-10-262-4/+4
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-268-10/+72
| | |\ \
| | | * | Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidgetGareth Stockwell2010-10-261-0/+2
| | | * | Create dummy window surface if if _q_DummyWindowSurface property is setGareth Stockwell2010-10-261-4/+16
| | | * | Remove widget subtree from backing store tracker when reparentedGareth Stockwell2010-10-263-3/+42
| | | * | Suppress call to controlVisibilityChanged for null control pointerGareth Stockwell2010-10-261-1/+2
| | | * | Fix patch_capabilities.pl script for explicit set of capabilitiesMiikka Heikkinen2010-10-261-0/+3
| | | * | Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-262-2/+7
| | | |/
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-277-4/+17
|\ \ \ \
| * | | | fix QEventLoop::X11ExcludeTimers with Glib event loopLuboš Luňák2010-10-271-0/+2
| * | | | Fix QAbstractProxyModel::mimeData to use list of mapped indexesPavel Lebedev2010-10-271-1/+1
| * | | | don't build qelfparser on non-elf platformsKonstantin Ritt2010-10-272-2/+9
| * | | | fix warningsKonstantin Ritt2010-10-272-1/+3
| * | | | fix build with sse2 and without ssse3Konstantin Ritt2010-10-271-0/+2
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-273-15/+93
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed a bug in the elf2e32_qtwrapper script.axis2010-10-271-14/+90
| * | | | Fix some build issues for building Qt for Symbian on Mac OS X.Liang Qi2010-10-272-1/+3
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-271-4/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Make sure the correct attribute arrays are enabled in GL's glyph cacheEskil Abrahamsen Blomfeldt2010-10-271-4/+4
|/ / /
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-268-8/+8
|\ \ \
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-268-8/+8
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-268-8/+8
| | |\ \ | | | |/ | | |/|
| | | * Doc : Fixing typo.Sergio Ahumada2010-10-268-8/+8
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-261-22/+8
|\ \ \ \
| * | | | QDataStream: speedup steaming of QString by avoiding an unesessary copy.Olivier Goffart2010-10-261-22/+8
* | | | | 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
| |\ \ \ \ | | |/ / /