summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added 'fullscreen video' menu option to media playerGareth Stockwell2009-11-192-90/+128
| | | | | Task-number: QTBUG-5586 Reviewed-by: Frans Englich
* Mediaplayer: do not exit full-screen when pausedGareth Stockwell2009-11-191-4/+4
| | | | | | | This modifies the patch which introduced "exit full screen when end of playback is reached": f9d36789 Reviewed-by: Frans Englich
* Keep the same capitalization for Phonon.dll.Frans Englich2009-11-161-1/+1
| | | | Task-number: QTBUG-4735
* qmediaplayer: pausing behavior for dialog inconvenient.Frans Englich2009-11-162-12/+18
| | | | | | | | | | qmediaplayer when popping up dialogs shouldn't: * play when it's paused * pause when playing only audio Task-number: QTBUG-5851 Reviewed-by: Gareth Stockwell
* Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-16639-26374/+31509
|\
| * 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
| | | * | | | | Add an entry to the changelog about the XUnit support in QtTestThiago Macieira2009-11-131-1/+4
| | | | | | | |
| | * | | | | | ChangeWindowTitle skipped for Windows CEninerider2009-11-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test fails on Windows CE due to QWorkspace state handling. As this class is obsolete, skipping this test resonable. The problem is added to the watch list for Windows CE in case it reappears. Reviewed-by: Joerg
| | * | | | | | Cursor motion related tests disabled for windows ce.ninerider2009-11-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling cursor function, Windows CE responds with: This function is not supported on this system. Reviewed-by: Joerg
| * | | | | | | Fix context sharing in QGLPixelBuffer for EGLRhys Weatherley2009-11-151-26/+39
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | | | | | Make pbuffers example compile under OpenGL/ES 1.1Rhys Weatherley2009-11-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | | | | | Make isSharing() reset to false when context no longer sharingRhys Weatherley2009-11-153-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for QGLContext::isSharing() indicates that the function returns true only when the context is sharing. However, previously the sharing flag would stay on if the context was created as sharing but is no longer sharing. Task-number: QTBUG-5578 Reviewed-by: Sarah Smith
| * | | | | | Make it clear that the two semi-floating widget should overflow.Jan-Arve Sæther2009-11-131-2/+2
| | | | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-133-10/+9
| |\ \ \ \ \ \
| | * | | | | | Fixed a regression in mainwindow that would not restore correctlyThierry Bastian2009-11-131-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size of the dockwidgets would be ignored. Reviewed-by: ogoffart
| | * | | | | | Fixed stroking of cosmetic dashed pens with the GL2 paint engine.Kim Motoyoshi Kalland2009-11-131-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed square caps which in some cases were extruded in the wrong direction. Task-number: QTBUG-5736 Reviewed-by: Trond
| | * | | | | | Fixed dockwidget autotest on X11Thierry Bastian2009-11-131-1/+4
| | | | | | | |
| * | | | | | | Remove warning. (Forgot to commit this together with my previous commits)Jan-Arve Sæther2009-11-131-1/+1
| |/ / / / / /
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-136-19/+90
| |\ \ \ \ \ \
| | * | | | | | QItemSelectionModel: fixed selection not kept when layout change and ↵Olivier Goffart2009-11-132-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | everything is selected The arbitrary number in commit 8a7700ffb5e4959e78 was not big enough. People still complains Task-number: QTBUG-5671 Reviewed-by: Thierry
| | * | | | | | Fixing and adding autotests for QTreeWidgetThierry Bastian2009-11-131-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: ogoffart
| | * | | | | | Fixed stroking of discontinuous paths with the GL2 engine.Kim Motoyoshi Kalland2009-11-132-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the stroke is rendered as a triangle strip, zero area triangles must be inserted in order to have gaps in the stroke. This is achieved by duplicating vertices before and after each gap. It was already done for open subpaths. This commit fixes gaps between closed subpaths. Task-number: QTBUG-5736 Reviewed-by: Gunnar
| | * | | | | | Fix QAbstractSlider testOlivier Goffart2009-11-131-3/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 46a3e518b3070c changed the behaviour of a wheel event of a different orientation. It works now no matter where the event was. Reviewed-by: Denis Reviewed-by: Thierry
generated by cgit v0.12 at 2024-11-27 21:57:56 (GMT)