summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Maemo4 fix Hildon input method for graphics viewRalf Engels2009-11-163-3/+6
| | | | Signed-off-by: axis <qt-info@nokia.com>
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-1630-537/+534
|\ | | | | | | 4.6-staging2
| * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-16639-26374/+31509
| |\
| * \ Merge branch '4.6' into mmfphononFrans Englich2009-11-16419-4222/+10751
| |\ \
| * | | Implemented aspect ratio and scale mode handling in Phonon MMF backendGareth Stockwell2009-11-1318-340/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replaced VolumeObserver and VideoOutputObserver interfaces with signals. - Added signals for propagating changes in aspect ratio and scale mode from VideoOutput to VideoPlayer. - Removed VideoPlayer::getNativeWindowSystemHandles. Interaction with window system is moved into VideoOutput, so that VideoPlayer is better focussed on its main task: interacting with CVideoPlayerUtility. - WId changes, resize and move events received by the VideoOutput widget cause it to emit a videoWindowChanged signal. This is received by the VideoPlayer, which triggers a call to updateVideoRect. The main task of this function is to calculate the scale factors which are provided to the MMF via CVideoPlayerUtility::SetScaleFactorL. Note that: i) This function must be called both before and after the call to SetDisplayWindowL. For changes in aspect ratio or scale mode, setting the scale mode after updating the display window is sufficient. However, testing showed that, when switching in or out of full-screen mode, two calls were necessary in order to preserve the correct aspect ratio. ii) The screen rectangle passed to the MMF is still the full window extent; it is not the region in which video will actually be rendered. The post-processor will fill in the remainder of the window with a background colour (typically black). If, on the other hand, we passed in the actual video display rectangle, we would need to do this background painting in the widget. This in turn would require a change to QtGui: at present, we can only disable blitting on a per-widget basis (by setting QWExtra::disableBlit). If we needed to paint the borders of the video window, disableBlit would need to contain the actual DSA region, rather than just a single boolean flag. Task-number: QTBUG-5585 Reviewed-by: Frans Englich
| * | | Pause playback on small screens when popping up dialogs.Frans Englich2009-11-122-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only done for small screens. Patch simplified by Gareth. Task-number: QTBUG-5307 Reviewed-by: Gareth Stockwell
| * | | Mediaplayer now pauses playback before displaying error dialogGareth Stockwell2009-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change improves the user experience - previously, video playback would continue in the background, while the user read the dialog. Then, when the dialog was dismissed, video playback would pause. Reviewed-by: Frans Englich
| * | | Allowed execution of pause command when backend is in error stateGareth Stockwell2009-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When qmediaplayer receives a stateChanged(ErrorState) signal, it first displays a dialog, and then calls pause() on the media object. This change allows that pause command to be executed on the underlying MMF client API. Reviewed-by: Frans Englich
| * | | Removed infinite recursion from Phonon::MMF::MediaObject::errorTypeGareth Stockwell2009-11-091-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Frans Englich
| * | | Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Gareth Stockwell2009-11-0911-167/+109
| |\ \ \ | | | | | | | | | | | | | | | mmfphonon
| | * | | Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG.Frans Englich2009-11-0911-167/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The debug{} directive in src/plugins/phonon/mmf/plugin/plugin.pro does not have any effect - this can be seen by looking at the generated MMP file, which has a STATICLIBRARY directive which is applied in both UDEB and UREL builds. This is the general problem that .pro files cannot tell distinction between the different targets that one makespec covers. Also remove objectdumpstub; objectdump was originally prepared for QtGui inclusion, but since that never happened, no other platforms than Symbian needs to be covered. Task-number: QTBUG-5466 Reviewed-by: Gareth Stockwell
| * | | | Fixed compiler warning for RVCT 2.2Gareth Stockwell2009-11-091-23/+24
| |/ / / | | | | | | | | | | | | Reviewed-by: trustme
| * | | Removed logging from Phonon MMF backendGareth Stockwell2009-11-051-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This statement calls a function (RWindowBase::ClientHandle) which was introduced in S60 3.2. Although there is a runtime check, a build made against 3.2 or above will fail on a 3.1 device. This manifests itself by the plugin failing to load. The log statement is not really necessary anyway, because, for window-owning controls, the window handle is the same value as the CCoeControl* pointer. This means that logging RWindowBase::ClientHandle is redundant information. Task-number: QTBUG-5406 Reviewed-by: trustme
* | | | Fix QT_NO_SHAREDMEMORY while not breaking the QNX buildJørgen Lind2009-11-161-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | | Fix warningOlivier Goffart2009-11-161-1/+1
| | | |
* | | | Revert "Added a standard copyright header to files generated by rcc."Olivier Goffart2009-11-161-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4c999f26a2cd255238d3543d2c4fdd3e51e70769. Generated file should not have our copyright (specially if it comes from customers) Reviewed-by: Marius Storm-Olsen
* | | | Fixed tab and tab contents frame overlapping when using style sheetsGabriel de Dietrich2009-11-161-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting the contents frame layout, the overlapping amount used was the one from the base style because we were checking the wrong widget. We now ensure that it's the QTabWidget we are checking for the pane pseudo-element subrule. Reviewed-by: Olivier Task-number: QTBUG-2555
* | | | Fixed extension checks and usage of the GL 2 engine on old X11 systems.Trond Kjernåsen2009-11-162-25/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression from 4.5, where exporting a GL capable display from an old X11 HP/Sun workstation to a modern Linux machine causes crashes and lots of X11 error output. Just relying on the client GL version number is not enough under X11, since the server might only support GL 1.1 with non or very few extensions. Also, the extension checks worked a bit randomly since it checked for sub-strings which might or might not occur within one or more full extension names. Task-number: QTBUG-5853 Reviewed-by: Kim
* | | | Properly initialize all vars.Thomas Zander2009-11-161-0/+1
| | | | | | | | | | | | | | | | This fixes a valgrind warning.
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-11-1648-489/+545
|\ \ \ \
| * | | | Fix regression in emitting of QTextDocument::undoCommandAdded()Thomas Zander2009-11-162-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test I wrote was not testing if calling undo/redo had any effect on emitting undoCommandAdded(), added these test cases and fixed the QTextDocumentPrivate::endEditBlock so we now again emit only when an undo command is added, not also on calling undo or redo. Reviewed-by: mae Reviewed-by: Samuel Rødal
| * | | | Fixed a crash in QPixmap::fromImage() when passing in a null image.Trond Kjernåsen2009-11-161-0/+5
| | |_|/ | |/| | | | | | | | | | | | | | Task-number: QTBUG-5840 Reviewed-by: Kim
| * | | Made widgets not clear their contents after losing edit focus.axis2009-11-162-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a behavior change from Qt 4.5. The motivation for the change is the following use case: A user types into a line or text edit, and gets interrupted by for example phone call or an SMS. This causes the active application to lose focus, which again causes edit focus to be lost. When resuming the application the focus gets set back, but the edit focus does not (nor should it). However, when the user types the next character, the line edit will erase *all* contents of the widget because it did not have edit focus. This is extremely destructive for a mobile phone user, especially since undo is not easily available. Another reason for doing that fix is that it seems that this is the mode of operation that most existing phones use. The fix is enabled for Symbian only at the moment, but will be followed by a patch for all platforms which will go into 4.7. Task: QTBUG-5698 RevBy: Jason Barron
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-166-26/+15
| |\ \ \ | | | | | | | | | | | | | | | 4.6-staging2
| | * | | Define own palette for web-based widgets in QS60StyleSami Merilä2009-11-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes no sense to use the S60-theme based palette in web based widgets. Web pages do not generally show theme background, but their own (or by default white) which clashes badly with WindowText and Text that are set to work with theme background. Therefore, QWebView and QGraphicsWebView need to be set their own palette for texts in theme palette hash. This improves visibility of text in webkit when QS60Style is active. Task-number: QTBUG-4885 Reviewed-by: Janne Koskinen
| | * | | Fix build error in QLibrary autotestShane Kearns2009-11-131-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Liang Qi
| | * | | Fix tst_collections compliation on symbian.Liang Qi2009-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | RevBy: TrustMe
| | * | | Fix tst_qfile, disable largefile for symbian.Liang Qi2009-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | RevBy: TrustMe
| | * | | Remove fake right mouse button events from long tapShane Kearns2009-11-132-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The context menu is launched by a separate event, not by the right mouse button. Generating the fake right mouse button caused side effects. We now treat the touch screen as a one button mouse, long taps still open the context menu using QContextMenuEvent. Task-number: QTBUG-5180 Reviewed-by: axis
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-s60axis2009-11-13208-711/+2056
| | |\ \ \
| * | \ \ \ Merge branch 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-1613-21/+113
| |\ \ \ \ \
| | * \ \ \ \ Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1696-1051/+1623
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'origin/4.6' into 4.6-ceninerider2009-11-16100-458/+1569
| | |\ \ \ \ \ \
| | | * | | | | | Fixed false positives in bic autoteststefan thomasson2009-11-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding QRegion::QRegionData, tagMENUITEMINFOA, tagMENUITEMINFOW, tagENHMETAHEADER to the class blacklist Merge-request: 2085 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| | | * | | | | | Install Qt declarative (if available) and QmlPatterns on S60Martin Jones2009-11-162-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Warwick Allison
| | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-145-16/+18
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix Qt file header, as spotted by tst_headers.Thiago Macieira2009-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust Me
| | | | * | | | | | Merge branch '4.5' into 4.6Thiago Macieira2009-11-134-15/+17
| | | | |\ \ \ \ \ \
| | | | | * | | | | | remove dependency on git line end conversionsOswald Buddenhagen2009-11-124-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistently use QIODevice::Text
| | | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-1312-119/+950
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Disable optimisations which break stack traces on MaemoTom Cooksey2009-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -O2 mode enables omit-frame-pointer & optimize-sibling-calls, which can break stack traces. So, even in release mode, disable these optimisations so that we can at least still get a backtrace when a Qt application dies. Reviewed-By: Stefano Pironato
| | | | * | | | | | | Generate debug symbols in release mode on MaemoTom Cooksey2009-11-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Stefano Pironato
| | | | * | | | | | | Add mkspec for Maemo 5 & 6Tom Cooksey2009-11-132-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Robert Griebl Reviewed-By: Thiago Macieira
| | | | * | | | | | | Merge branch 'necessaryBCPatches' into 4.6axis2009-11-1310-119/+876
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix corelib def files for the new atomics implementationShane Kearns2009-11-132-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6.0 has the wrong atomics implementation for symbian, as the team branch was not merged before the freeze. This updates the def files to match the implementation on the team branch so that it can be cherry-picked. Task-number: QTBUG-5752 Reviewed-by: Iain
| | | | | * | | | | | | Fix functions that return whether atomics are natives following review commentsShane Kearns2009-11-132-18/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Brad
| | | | | * | | | | | | Binary compatibility of Symbian ARMv5 and ARMv6 buildsShane Kearns2009-11-139-39/+587
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ARMv6 atomics where available Use OS atomics otherwise Integrate ARMV6 atomics to Symbian builds Use compiler defined macros to detect if ARMv6 instructions are available This defines the QT_HAVE_ARMV6 macro, replacing the way it was defined by the Symbian build system previously in qpainting.pri. qatomic_symbian now uses qatomic_arm or qatomic_armv6 automatically Port armv6 atomics to implement generic atomics interface The inline atomics are not inlined when we build for thumb using RVCT. So there is no performance improvement of using the "inline" versions vs a shared version called through a function call. The generic atomics interface is good for binary compatibility, as the same symbols are exported in all versions now. Changed the fallback generic atomics implementation from the unix one to a symbian specific one using RFastLock (identical code to the windows generic atomics, except for RFastLock replaces Win32 CRITICAL_SECTION) Note: GCCE atomics still need porting Tell git to ignore .lst listing files (produced by sbs/abld listing) ARMv6 support for GCCE compiler and fallback implementation using OS When building corelib with GCCE and -march=armv6, QT_HAVE_ARMV6 will be defined. This patch adds copies of the asm functions in GCC syntax. When building for the Symbian emulator, or ARMv5, then Symbian OS atomic functions are used as a fallback - these are more efficient than the unix atomics, and don't require data import (which the ARMv5 atomics use, but the OS loader doesn't support fully) Symbian OS functions are always used for QBasicAtomicInt::ref / deref, because these are faster than the generic function in all cases. They are machine coded for ARMv6, and are used internally by RFastLock. Reviewed-By: axis Reviewed-By: Brad
| | | | | * | | | | | | Add the ARMv6 inline assembly code for compiling with RVCT.Thiago Macieira2009-11-131-0/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically a copy & paste of the GCC inline assembly above, switched to the RVCT inline assembly model (which is actually easier to write and understand). I verified that this code compiles and assembles as expected. The output generated by RVCT is pretty much on the mark. However, I have not executed this code yet to see if it performs as expected. To be noted: - when expanding the inline template code, RVCT may be tempted to switch your entire function to ARM mode. Should we add __attribute__((noinline)) to prevent that? - There's no equivalent to GCC inline assembler's clobber, especially of "memory". Also, there's no "volatile" qualifier to the assembly. Does the compiler know it can't reorder the code? Does it know it shouldn't trust the value of the memory after this? My test indicates the code is fine... Reviewed-By: Shane Kearns
| | | | | * | | | | | | Reorganize the qatomic_armv6.h file to receive the RVCT inlineThiago Macieira2009-11-131-81/+90
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assembly. Move the *Relaxed, *Acquire and *Release functions (which are simply forwarding calls to the *Ordered version) to the bottom of the file. Reviewed-By: Shane Kearns
| | | * | | | | | | | Fix broken merge of changes file.Jason McDonald2009-11-131-4/+0
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-11-12 17:40:32 (GMT)