summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-082-2/+2
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0836-59/+424
| |\
| * | qdoc: Fixed broken QML property links.Martin Smith2010-07-082-2/+2
| | | | | | | | | | | | Task-number: QTBUG-12038
* | | Doc: Correcting img bugMorten Engvoldsen2010-07-081-1/+0
| |/ |/| | | | | Task-number: QTBUG-12028
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-087-14/+296
|\ \
| * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-085-6/+38
| |\ \
| | * | Change default TapAndHold timeout and make configurableThomas Zander2010-07-084-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new default timeout is 700ms and is what Nokia Research found through usability studies. Nevertheless lets provide public API to set this through a platform plugin or similar. Reviewed-By: Denis
| | * | Avoid unneeded additionThomas Zander2010-07-081-2/+2
| | | | | | | | | | | | | | | | Reviewed-By: Denis
| * | | Doc: changing offline styleMorten Engvoldsen2010-07-081-0/+251
| |/ / | | | | | | | | | This file will however be replaced in the near future
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0832-935/+250
| |\ \
| * | | Doc: fixing style from 600 to bold weightMorten Engvoldsen2010-07-081-8/+7
| | | |
* | | | Doc: change on index pageMorten Engvoldsen2010-07-081-1/+1
| |/ / |/| |
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0828-43/+199
|\ \ \
| * | | Build Qt with option -Zc:wchar_t under MSVCliang jian2010-07-083-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make projects generated by visual studio being successfully linked to the Qt dlls if they use the QString::fromWCharArray() or QString::toWCharArray() methods. Merge-request: 727 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Fix compilation when QT_NO_IM is definedTasuku Suzuki2010-07-083-1/+8
| | | | | | | | | | | | | | | | | | | | Merge-request: 734 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0863-1473/+534
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) fix build with sqlite2 respect UI_DIR when creating image collections Doc: more cleaning Doc: fixing escape character Doc: cleaning html generator Doc: changing index page Doc: fixing link to devnet Doc: adding HTML class names and style docs to the generator Doc: Fixing typo - background file name doc: Added doc for accessing views and models from delegates. Doc: Fixing broken link Doc: fixing typo Doc: fixing typos qdoc: Fixed table of contents for namespace pages. SSL backend: load libraries for certificates only once immediately set function context when entering a namespace Phonon MediaSource fails to load when passed as a resource file Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default value qdoc: Fixed a few links to QtObject (QML:QtObject) Simplify *= to += after contains() test ...
| | * | | fix build with sqlite2Oswald Buddenhagen2010-07-081-2/+2
| | | | |
| | * | | respect UI_DIR when creating image collectionsOswald Buddenhagen2010-07-081-6/+6
| | | |/ | | |/| | | | | | | | | | | | | Reviewed-by: joerg Task-number: QTBUG-11752
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-087-894/+54
| | |\ \
| | * | | doc: Added doc for accessing views and models from delegates.Martin Smith2010-07-081-0/+73
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11648
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-0819-31/+107
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use lower case for including system header files Added trace statements to Phonon MMF backend MMF Phonon backend: call winId() from VideoWidget constructor Fixed crash which occurs when switching between video clips Close media clip before creating new player object Enable bufferStatus signal during video clip loading on NGA platforms Prevent crash when video is played without a VideoWidget Add partial update deployment rules to QtNetwork Fix crash when handleCommand() called before softkeys are updated
| | * | | | Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All platform includes are now lower case, i.e. '#include <foobar.h>' rather than '#include <FooBar.h>'. Note that Qt includes are still camel case, e.g. '#include <QtGui/QWidget>' Task-number: QTBUG-6528 Reviewed-by: trustme
| | * | | | Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | MMF Phonon backend: call winId() from VideoWidget constructorGareth Stockwell2010-07-072-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to be consistent with the backends for other platforms, which also call QWidget::winId() on the VideoWidget (or one of its children) during construction. Reviewed-by: Thierry Bastian
| | * | | | Fixed crash which occurs when switching between video clipsGareth Stockwell2010-07-072-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Phonon::MediaObject::setCurrentSource() is called when the MediaObject is connected to a Phonon::VideoWidget, the MMF::AbstractVideoOutput pointer is propagated inside the backend from the first MMF::AbstractVideoPlayer to the second. If the VideoWidget is subsquently re-sized, the code path enters the ScaleFactors branch of the MMF::SurfaceVideoPlayer::handleParametersChanged function. At this point, m_displayWindow is still set to the inital null value, and the assertion therefore fails. This change ensures that m_displayWindow is updated before attempting to apply the scale factor change. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
| | * | | | Close media clip before creating new player objectGareth Stockwell2010-07-075-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failure to Close() an existing MMF player utility object before creating a new one - which happens in the MMF backend's implementation of Phonon::MediaObject::setCurrentSource() - causes intialization of the newly-created utility to fail later on. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
| | * | | | Enable bufferStatus signal during video clip loading on NGA platformsGareth Stockwell2010-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CVideoPlayerUtility::RegisterForVideoLoadingNotification() was only called in the DSA, not the NGA, variant of the Phonon MMF backend. Task-number: QTBUG-11378 Reviewed-by: Thierry Bastian
| | * | | | Prevent crash when video is played without a VideoWidgetGareth Stockwell2010-07-073-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon API allows video to be played via a Phonon::MediaObject, even if no Phonon::VideoWidget has been connected to it. This patch prevents the Phonon MMF backend crashing in this scenario due to dereferencing a null pointer. Reviewed-by: Thierry Bastian
| | * | | | Add partial update deployment rules to QtNetworkShane Kearns2010-07-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial update allows you to build a qtnetwork.sis which can be installed on top of a matching qt.sis, but contains only the qtnetwork.dll file. This is faster to install, so it's useful when developing qtnetwork. Reviewed-by: Simon Hausmann
| | * | | | Fix crash when handleCommand() called before softkeys are updatedJason Barron2010-07-072-1/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys are updated via a compressable event that is posted via the event loop. Since these events are not delivered immediately, there is a chance that a call to handleCommand() could happen before the softkeys have been updated which can lead to a crash if the previous QAction's have been deleted already since the data structure used by QSoftKeyManager is outdated. The likeliness of this is increased by the fact that S60 commands are normally sent from the WSERV active object which has a higher priority than the active object used by Qt's event loop which means commands will preempt the event loop. The fix is to introduce a flag that keeps track of pending update requests and if a command is received while there are outstanding requests, force the softkeys to be updated before handling the command. Task-number: QT-3571 Reviewed-by: axis
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0716-463/+299
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix autotest Adapt the TapAndHold recognizer to non-touch too add setNativeArguments() and nativeArguments() fix bogus return value from qprocess::execute() qdoc: Simplified code to enable fixing of QTBUG-6340. Doc: fixing img style
* | | | | | Doc: documenting docsMorten Engvoldsen2010-07-081-1/+1
| |_|_|/ / |/| | | |
* | | | | Doc: more cleaningMorten Engvoldsen2010-07-081-24/+3
| | | | |
* | | | | Doc: fixing escape characterMorten Engvoldsen2010-07-081-1/+1
| | | | |
* | | | | Doc: cleaning html generatorMorten Engvoldsen2010-07-081-26/+0
| | | | |
* | | | | Doc: changing index pageMorten Engvoldsen2010-07-084-856/+62
| |_|_|/ |/| | |
* | | | Doc: fixing link to devnetMorten Engvoldsen2010-07-081-1/+1
| | | |
* | | | Doc: adding HTML class names and style docs to the generatorMorten Engvoldsen2010-07-081-32/+34
| | | |
* | | | Doc: Fixing typo - background file nameMorten Engvoldsen2010-07-081-1/+1
| | | |
* | | | Doc: Fixing broken linkMorten Engvoldsen2010-07-081-1/+1
| | | |
* | | | Doc: fixing typoMorten Engvoldsen2010-07-081-3/+2
| | | |
* | | | Doc: fixing typosMorten Engvoldsen2010-07-082-3/+3
| |_|/ |/| |
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-089-36/+78
|\ \ \
| * | | SSL backend: load libraries for certificates only oncePeter Hartmann2010-07-073-29/+30
| | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| * | | immediately set function context when entering a namespaceOswald Buddenhagen2010-07-073-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, tr() calls without absolute qualification will not be properly qualified inside the first function if it has no qualification, either. Task-number: QTBUG-11742 (not really)
| * | | Phonon MediaSource fails to load when passed as a resource fileJens Bache-Wiig2010-07-072-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files fail to load when passing resoure path to mediasource. The original regression seems to be caused by a behavior change as reported here: http://bugreports.qt.nokia.com/browse/QTBUG-12015 Note a merge request is also pending on Gitorious http://gitorious.org/phonon/phonon/merge_requests/17 Task-number: QTBUG-9323 Reviewed-by: thierry
| * | | Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default valueAdrian Constantin2010-07-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove workaround introduced in Qt 4.6 as not needed any more Reviewed-by: Adrian Constantin
* | | | qdoc: Fixed table of contents for namespace pages.Martin Smith2010-07-081-1/+2
|/ / / | | | | | | | | | Task-number: QTBUG-11992
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0725-232/+164
|\ \ \
| * | | Simplify *= to += after contains() testMark Brand2010-07-078-14/+14
| | | | | | | | | | | | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v0.12 at 2025-08-25 15:31:03 (GMT)