summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-187-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 7bdf90f753d25fb1b5628b0980827df11110ad5a ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com> Reviewed by Simon Hausmann. [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit. * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::render): 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. Clarify and simplify the legal section in the overview documentation, after review with our legal team. * docs/qtwebkit.qdoc: 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed and suggested by Tor Arne Vestbø. Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f to compare the Qt::ImFont property's family against an explicitly previously configured family. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods):
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1886-787/+842
|\ | | | | | | | | Conflicts: configure.exe
| * Fix the mentioning of the LGPL licensing of QtScript and QtWebKitSimon Hausmann2009-11-181-5/+2
| | | | | | | | | | | | | | | | | | | | As discussed with the legal team: * Removed the confusing sentence about the LGPL version. * Replaced the use of "Lesser" with "Library" * Use the same notice for QtWebKit and QtScript Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1860-715/+748
| |\
| | * register pointer type for invokeRobert Griebl2009-11-181-0/+4
| | |
| | * Remove DWCAPS_DOUBLEBUFFER in window creationAnders Bakken2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This value seems to cause problems on various chipsets and we get a double buffered window regardless. Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit 3bc9a381ebfaf9144120936bb579b71fc7cf29ae)
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-11-17328-4760/+7293
| | |\
| | | * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1750-678/+652
| | | |\
| | | | * Fix long text regression in listview that does not fits into the viewport.Olivier Goffart2009-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit f44fe888ee82b9e04, we adjusted the item size to the size of the viewport. It should really be adjusted to the size of the content. Task-number: QTBUG-5854 Reviewed-by: Gabi
| | | | * Fix tst_QGraphicsView::inputMethodSensitivity autotestOlivier Goffart2009-11-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the scene was not notified it lost the focus when it was disconnected from the view (with setScene) So when it got back the focus, nothing was updated because the scene thought it still had the focus. Reviewed-by: jasplin
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-171-3/+0
| | | | |\ | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | * Fixing merger errors.Aleksandar Sasha Babic2009-11-161-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing some unreferenced variables that were left overs after revert&merge operation. Reviewed-by: Kim Motoyoshi Kalland
| | | | * | QFileDialog: user could not select a readonly file on vista and win7Thierry Bastian2009-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: prasanth
| | | | * | Fixed querying of GLX extensions under X11.Trond Kjernåsen2009-11-161-13/+14
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We always queried the client for its GLX extensions and used them blindly, even though they might not be available in the server. Also fixed the extension string check itself. We used simple sub-string search, which could potentially break if one extension name is a sub-string of another. Task-number: QTBUG-5732 Reviewed-by: Kim
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-163-3/+6
| | | | |\ | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | * Maemo4 fix Hildon input method for graphics viewRalf Engels2009-11-163-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| | | | * | QMenu: do not crash if action is destroyed in the triggered signal.Olivier Goffart2009-11-161-1/+2
| | | | |/ | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4480 Reviewed-by: Thierry
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-1628-536/+512
| | | | |\ | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-16431-23894/+26160
| | | | | |\
| | | | | * \ Merge branch '4.6' into mmfphononFrans Englich2009-11-16254-2977/+6091
| | | | | |\ \
| | | | | * | | 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
| | | | | * | | 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
| | | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-11-1624-445/+291
| | | | |\ \ \ \
| | | | | * | | | Fix regression in emitting of QTextDocument::undoCommandAdded()Thomas Zander2009-11-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-163-21/+10
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | * | | 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 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-162-0/+6
| | | | | |\ \ \ \
| | | | | * | | | | Fix context sharing in QGLPixelBuffer for EGLRhys Weatherley2009-11-151-26/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | | | * | | | | | Fixed double precision problems in pdf printingGunnar Sletta2009-11-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increased the precision of the output to 9 decimals. Not ideal but better than just 6. Reviewed-by: Trond
| | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-11-174-29/+66
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | No audio devices found for Ubuntu with QAudio classesKurt Korbatits2009-11-164-29/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed alsa implementation to present audio devices from alsa. Task-number:QTBUG-5723 Reviewed-by:Justin McPherson
| | * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-11-124-7/+25
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fix compilation of Phonon DS9 backend when Qt is built statically.Andrew den Exter2009-11-123-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt_plugin_instance() isn't defined in a static build. Assign a pointer the shared mutex to static member variable in the backend constructor, rather than returning it from a static member function. Task-number: QTBUG-5207 Reviewed-by: Justin McPherson
| | | * | | | | | | | Fix assert on windows when deleting phonon nodes from a running graph.Andrew den Exter2009-11-121-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If removing a filter from the direct show graph fails because it is running, stop the graph and try again. Task-number: QTBUG-5011 Reviewed-by: Justin McPherson
| | | * | | | | | | | Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-111-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | | | Phonon; Integrate changes to cmake files.Justin McPherson2009-11-114-20/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | | | Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | id. This fix is similar to KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
generated by cgit v0.12 at 2024-11-12 15:32:54 (GMT)