summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-261-4/+12
|\
| * QComboBox popup incorrectly opened in Sym^3Sami Merila2011-01-261-4/+12
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-263-0/+3
|\ \
| * | Add util/xkbdatagen/READMEOlivier Goffart2011-01-263-0/+3
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-261-4/+4
|\ \ \ | |/ / |/| / | |/
| * Application background is incorrect if app locked to landscape.Sami Merila2011-01-261-4/+4
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-2611-70/+383
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-2511-70/+383
| |\ |/ /
| * QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-258-40/+303
| * Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"Kent Hansen2011-01-259-309/+44
| * add autotest for digest authenticationPeter Hartmann2011-01-251-10/+20
| * QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-259-44/+309
| * Improved performance of mapFromGlobal/mapToGlobal on X11Denis Dzyubenko2011-01-251-0/+28
| * Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivateDenis Dzyubenko2011-01-252-20/+32
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-252-3/+3
|\ \
| * | Temporary fix for ambiguous cast from four letter char constantEckhart Koppen2011-01-251-2/+2
| * | Fix QMAKE_POST_LINK in Symbian for targets with special characters.Miikka Heikkinen2011-01-251-1/+1
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-252-1/+31
|\ \ | |/ |/|
| * Fix cursor position adjustment when removing stringsJiang Jiang2011-01-252-1/+31
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-253-23/+343
|\
| * Avoid possible font name collisions on fbservAlessandro Portale2011-01-243-23/+343
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-245-4225/+4148
|\ \ | |/ |/|
| * Update of Czech translation for Qt 4.7-stablePavel Fric2011-01-245-4225/+4148
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-242-18/+7
|\
| * Fix crash in QtScript/JSC stack allocator on SymbianKent Hansen2011-01-241-0/+6
| * HTTP: fix digest authenticationPeter Hartmann2011-01-241-18/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-241-0/+1
|\ \
| * | Fixed UTF-8 application names in device application menu in SymbianMiikka Heikkinen2011-01-241-0/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-241-2/+8
|\ \ \ | |/ / |/| |
| * | Fix loop count in animanted gifs sometimes being incorrectSimon Hausmann2011-01-241-2/+8
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-211-2/+18
|\ \ | |/
| * Validate arguments to QDBusConnection::connectThiago Macieira2011-01-211-2/+18
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-218-23/+18
|\
| * make the test a bit stricterRitt Konstantin2011-01-211-0/+2
| * ignore the warning from auto-detach in destructorRitt Konstantin2011-01-211-1/+2
| * get rid of extra calls to handle()Ritt Konstantin2011-01-211-9/+4
| * simplify QSharedMemory::detach()Ritt Konstantin2011-01-213-5/+3
| * avoid extra calculationsRitt Konstantin2011-01-212-4/+2
| * fix error reporting on detach()Ritt Konstantin2011-01-211-1/+1
| * fix error reportingRitt Konstantin2011-01-211-0/+1
| * Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.Miikka Heikkinen2011-01-212-3/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-211-1/+1
|\ \ | |/
| * Fix to pen state handling in OpenVG paint engine.Jani Hautakangas2011-01-211-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-217-10/+31
|\
| * BorderImage fails for .sci source containing a URLMartin Jones2011-01-213-5/+13
| * positionViewAtIndex can fail when positioned near end of list.Martin Jones2011-01-214-5/+18
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-213-89/+67
|\ \ | |/
| * Revert "Fix loaded() signal to be emitted only once"Bea Lam2011-01-213-89/+67
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-203-11/+13
|\
| * Revert "don't include harfbuzz where we don't use it"Oswald Buddenhagen2011-01-205-0/+9