summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-021055-3656/+8309
|\ | | | | | | | | Conflicts: src/gui/kernel/qwidget_s60.cpp
| * Add configure flags to force turning on or off JavaScriptCore JITJørgen Lind2009-10-022-0/+5
| | | | | | | | | | | | | | | | | | Also add configure test to see if arm toolchain can compile JavaScript JIT Task-number:QTBUG-4632 Reviewed-by:Simon Hausmann <simon.hausmann@nokia.com>, Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Update documentation for sorting / stacking order in Graphics View.Andreas Aardal Hanssen2009-10-023-164/+202
| | | | | | | | | | | | | | | | | | | | Remove all references to "elevation" and how items are sorted by their "z order". Now use "stacking order" and only refer to "z-value" when discussing sibling order. Move almost all sorting docs from the QGraphicsItem::setZValue() function to a general overview section in QGraphicsItem's class documentation. Reviewed-by: David Boddie
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-023-37/+28
| |\
| | * Remove QHash overhead from QGLShareRegisterRhys Weatherley2009-10-022-28/+20
| | | | | | | | | | | | | | | | | | | | | Move the list of shared contexts from QGLShareRegister into QGLContextGroup. There is then no need for the QHash. Reviewed-by: trustme
| | * Fix support for 32-bit PowerVR screens with QGraphicsViewRhys Weatherley2009-10-021-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QGLWidget was used as a viewport for QGraphicsView, it was still treating the window surface as RGB16. Use the screen's actual pixel format. Also ensure that PvrEglWindowSurface::image() returns a non-null QImage if the drawable hasn't been created yet. Reviewed-by: trustme
| | * Remove unnecessary reference to QGLContextGroup::extensionFuncs()Rhys Weatherley2009-10-021-2/+0
| | | | | | | | | | | | Reviewed-by: Andrew den Exter
| | * Remove unnecessary function definition: qt_qgl_egl_display()Rhys Weatherley2009-10-011-2/+0
| | | | | | | | | | | | | | | | | | The qt_qgl_egl_display() function no longer exists. Reviewed-by: trustme
| * | Fixed logic in clock() function of audio class's.Kurt Korbatits2009-10-026-4/+10
| |/ | | | | | | | | | | | | - clock() should return valid value except in stop state, return 0. - Added clock() function testing to unit tests. Reviewed-by:Justin McPherson
| * Add "opengl2" as an option for creating an OpenGL graphics systemRhys Weatherley2009-10-011-0/+10
| | | | | | | | Reviewed-by: trustme
| * Make Software Input Panel requests work with QGraphicsWebView _and_ QWebView ↵Simon Hausmann2009-10-013-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | by sharing the event code in handleSoftwareInputPanel(). Patch by Simon Hausmann <simon.hausmann@nokia.com> on 2009-10-01 Reviewed by Tor Arne Vestbø. * Api/qwebpage.cpp: (QWebPagePrivate::mouseReleaseEvent): (QWebPagePrivate::handleSoftwareInputPanel): * Api/qwebpage_p.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48977 268f45cc-cd09-0410-ab3c-d52691b4dbfc
| * Fix BadDrawable errors when re-parenting a QGLWidget on X11/EGLTom Cooksey2009-10-011-2/+13
| | | | | | | | | | | | | | | | | | | | It's actually not really reparenting, but calling setWindowFlags which triggered the errors. But setWindowFlags causes a re-parent. The context isn't really the right please to free the surface, but fixing that is a much more intrusive change. Reviewed-By: TrustMe
| * Refactor retrieving the X11 visual for EGLEskil Abrahamsen Blomfeldt2009-10-011-74/+84
| | | | | | | | | | | | | | | | | | We need this in qwindowsurface_gl.cpp. This patch was modified slightly by Tom, who stole it from another branch. :-) Reviewed-by: Gunnar
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-10-013-3/+30
| |\
| | * Fixed Designer property editor selection bug.Gabriel de Dietrich2009-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the editor had been created inside the QtPropertyEditorView (inheriting QTreeWidget), the subsequent show sent a synthetic mouse move event down to the QLineEdit, and a new selection was made on the text because the mouse button was marked as pressed in the event. QApplicationPrivate::sendSyntheticEnterLeave() now sends a mouse move event without any button pressed. Auto-test included in tst_QWidget. Task-number: QTBUG-4055 Task-number: 253159 Task-number: QT-659 Task-number: 245398 Reviewed-by: bnilsen
| | * Fixes clipboard handling on X11.Denis Dzyubenko2009-10-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes handling selection requests for invalid targets - when someone asks for a target that is not supported by the clipboard content we shouldn't do anything (unless it's MULTIPLE). Fixes copying data when using Synergy which tries to get all targets it knows about even if they are not listed in TARGETS. Task-number: QTBUG-4652 Reviewed-by: Bradley T. Hughes
| | * QNAM HTTP Code: Always send an Accept-Language headerMarkus Goetz2009-10-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Send a header that we accept every language. Works around a bug in some broken websites and is hopefully of no harm for us. Task-number: QT-952 Reviewed-by: Thiago
| | * Fixes: Phonon-gst: Respect device MediaSource property.Dmytro Poplavskiy2009-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task: QT-1027 RevBy: Andrew den Exter Details: All gst disk sources support setting device name with "device" property, otherwise the default device is used.
| | * Fixes: Phonon-gst: use correct URLs for different disk types.Dmytro Poplavskiy2009-10-011-2/+15
| | | | | | | | | | | | | | | | | | | | | RevBy: Andrew den Exter Details: Phonon gstreamer backend used cdda:// URL and corresponding gst source element regardless of disk type.
| * | Rename QWebGraphicsItem to QGraphicsWebViewAlexis Menard2009-10-018-96/+96
| | | | | | | | | | | | | | | | | | | | | Patch by Alexis Menard <alexis.menard@nokia.com> on 2009-10-01 Reviewed by Tor Arne Vestbø. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48974 268f45cc-cd09-0410-ab3c-d52691b4dbfc
| * | Fixed typo in the doc.Denis Dzyubenko2009-10-011-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
| * | Use "if (1) {} else" instead of "if (1); else" to silence compiler.Volker Hilsheimer2009-10-011-2/+2
| | | | | | | | | | | | Rev-by: Thiago
| * | Reset timeout-checker before evaluating when processEventsInterval is usedKent Hansen2009-10-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the timeout-checker was not reset, it could take a while (e.g. 1-2 seconds) before the next timeout occurred, depending on what the tick counter happened to be after the previous evaluate(). When a processEventsInterval of e.g. 100 milliseconds has been specified, we want the timeout to happen much sooner, thus we need to reset the checker. This will cause the first timeout to happen quickly, and then at steady intervals (processEventsInterval ms) after that. The tst_QScriptEngine::processEventsWhileRunning() test was sporadically failing due to this issue. Reviewed-by: Olivier Goffart
| * | Add input method hint for URL input widgets.Volker Hilsheimer2009-10-012-0/+2
| | | | | | | | | | | | Rev-by: Axis
| * | S60 qt_init() fix to set system fontmread2009-10-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives the system font the default font family name, which is appropriate for S60, "Series 60 Sans". Without this, the system font has a requested family name of "Helvetica". Upside of this fix is that it makes tst_qFontComboBox pass on S60 Reviewed-by: Alessandro Portale
| * | remove unused member from QWidgetData on Windows CEJoerg Bornemann2009-10-014-10/+1
| | | | | | | | | | | | Reviewed-by: thartman
| * | qdoc: Marked some undocumented Phonon classes internalMartin Smith2009-10-011-1/+1
| | |
| * | Fix: Abstract slider does not understand wheel events properlyRichard Moe Gustavsen2009-10-016-37/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A wheel event contain delta values that describe the rotation angle the wheel was rotated (in 1/8 of a degree). For some mouse devices (thinking of mac mighty mouse/trackpad) the resolution is better than the standard 15 degrees. The Qt docs describe how to deal with this. But abstract scrollbar does did follow this recipe, but it does now with this patch. Reb-By: prasanth
| * | Fixed software input panel support on web input elements.Simon Hausmann2009-10-013-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by axis on 2009-10-01 Reviewed by Simon Hausmann. Send the RequestSoftwareInputPanel event if the element supports focus and the element is clicked. * Api/qwebpage.cpp: (QWebPagePrivate::QWebPagePrivate): (QWebPagePrivate::mousePressEvent): (QWebPagePrivate::mouseReleaseEvent): * Api/qwebpage_p.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48968 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | Implementation for QWebPage::inputMethodQuery and ↵Simon Hausmann2009-10-014-36/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWebPagePrivate::inputMethodEvent Patch by Joe Ligman <joseph.ligman@nokia.com> on 2009-10-01 Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=29681 Some additional changes from axis: * Fixed surrounding text to exclude preedit string * Avoid emission of microFocusChanged during setComposition() * Api/qwebpage.cpp: (QWebPagePrivate::inputMethodEvent): (QWebPage::inputMethodQuery): * WebCoreSupport/EditorClientQt.cpp: (WebCore::EditorClientQt::respondToChangedSelection): * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48967 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | qdoc: Marked some undocumented Phonon classes internalMartin Smith2009-10-0116-0/+74
| | |
| * | fix minimizing for Windows CE and Windows mobileJoerg Bornemann2009-10-013-28/+30
| | | | | | | | | | | | | | | Task-number: QT-2243 Reviewed-by: thartman
| * | warning fix in qgraphicseffect_p.h for qreal == floatJoerg Bornemann2009-10-011-1/+1
| | | | | | | | | | | | Reviewed-by: thartman
| * | Enable qws/qvfb use for multiple users on one machineJeremy Katz2009-10-015-26/+32
| | | | | | | | | | | | | | | Task-number: QTBUG-1711 Reviewed-by: Paul
| * | Fixed QPixmap::fromImage when using Format_Mono for Symbian.Janne Anttila2009-10-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intermediate sourceImage was stored to wrong QImage object (image instead of correct sourceImage). This made subsequent switch-case statement to fail because destFormat was set to QImage::Format_Invalid Autotest: Fixes QItemDelegate::decoration autotest Reviewed-by: Jani Hautakangas
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-013-6/+23
| |\ \
| | * | Doc: Mark new overloads with \since 4.6.Volker Hilsheimer2009-10-011-1/+6
| | | |
| | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-011023-3545/+7949
| | |\ \
| | | * | Fixes clipboard handling on X11.Denis Dzyubenko2009-10-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes handling selection requests for invalid targets - when someone asks for a target that is not supported by the clipboard content we shouldn't do anything (unless it's MULTIPLE). Fixes copying data when using Synergy which tries to get all targets it knows about even if they are not listed in TARGETS. Task-number: QTBUG-4652 Reviewed-by: Bradley T. Hughes
| | * | | Worked around S60 3.1 bug in CCoeControl::PositionRelativeToScreenMiikka Heikkinen2009-10-011-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CCoeControl::PositionRelativeToScreen sometimes freezes the device in S60 3.1 based devices. Exact cause is unknown, but it might be OOM situation given that some cases where this is an issue, changing to a simpler theme makes the freeze go away. Task-number: QTBUG-4565 Reviewed-by: Sami Merila Reviewed-by: Espen Riskedal
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-011009-3504/+7709
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix crash in S60 input methods after task switchingShane Kearns2009-10-011-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When switching away from the application, the focused widget is set to null. When switching back, there are callbacks from S60 before the focus has been restored. These functions check for null widget, but the output function parameters are left uninitialised, which causes a crash inside the S60 FEP. 1) GetXYZ functions now initialise the output parameters even when the focused widget is null. 2) Return no input capability when there is no focused widget, as was already done during destruction. This stops most of the callbacks from S60. Task-number: QTBUG-4618 Reviewed-by: axis
| | * | | qdoc: Added a missing "/" in a "<h2>".Martin Smith2009-10-011-105/+107
| | | | |
| | * | | Fix column number provided to QScriptEngineAgentKent Hansen2009-10-013-65/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced a helper function in our custom source provider, columnNumberFromOffset(), that maps an absolute offset in the source input to a relative column number. Reviewed-by: Jedrzej Nowacki
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-10-016-15/+22
| | | | | | | | | | | | | | | | | | | | jsc-for-qtscript-4.6-staging-01102009 ( 79e88e90aab6674098b6d73b1b41998117164499 )
| | * | | Fix an issue that was uncovered by two tst_QAbstractItemView fails.Alessandro Portale2009-10-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QAbstractItemView::shiftArrowSelectionAfterScrolling() and tst_QAbstractItemView::shiftSelectionAfterRubberbandSelection() are two relatively new test cases that always failed when Qt was configured with QT_KEYPAD_NAVIGATION. And that even though we set the navigation mode to Qt::NavigationModeNone when running autotests for Symbian. Fix: in QAbstractItemViewPrivate::extendedSelectionCommand(), we make sure that even with keypad navigation enabled, the shift-arrow feature is available. Reviewed-by: Jani Hautakangas modified: src/gui/itemviews/qabstractitemview.cpp
| | * | | Updated WebKit from /home/joce/dev/qtwebkit/ to ↵Jocelyn Turcotte2009-10-01920-2312/+5816
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtwebkit-4.6-snapshot-30092009-2 ( 284ebfc0df42d408d99838507c1ed335fba9bcf0 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-09-29 Andras Becsi <becsi.andras@stud.u-szeged.hu> Reviewed by Tor Arne Vestbø. [Qt] Default font size reconciliation to 16px/13px to match other platform's de-facto standard. This fixes https://bugs.webkit.org/show_bug.cgi?id=19674. * Api/qwebsettings.cpp: (QWebSettings::QWebSettings): 2009-09-29 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=29844 QWebPage dependency autotest fix. Fix for database() autotest. All opened databases should be removed at end of test. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::database): 2009-09-29 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed by Simon Hausmann. Some QWebHistory and QWebPage autotest crash fixes. Some checking for m_mainFrame were added. MainFrame should be created at some point of QWebPage live cicle. https://bugs.webkit.org/show_bug.cgi?id=29803 * Api/qwebpage.cpp: (QWebPage::~QWebPage): (QWebPage::currentFrame): (QWebPage::history): (QWebPage::selectedText): (QWebPage::updatePositionDependentActions): * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::crashTests_LazyInitializationOfMainFrame): 2009-09-29 Kenneth Rohde Christiansen <kenneth@webkit.org> Reviewed by Simon Hausmann and Tor Arne Vestbø. Implement QWebPage Extension for error pages, incl. an example on how to use it in QtLauncher. Correct our use of ResourceError. * Api/qwebpage.h: (ExtensionOption::): (ExtensionOption::ErrorPageExtensionReturn::ErrorPageExtensionReturn): * QtLauncher/main.cpp: (WebPage::supportsExtension): (MainWindow::MainWindow): (MainWindow::selectElements): (WebPage::extension): * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::cancelledError): (WebCore::FrameLoaderClientQt::blockedError): (WebCore::FrameLoaderClientQt::cannotShowURLError): (WebCore::FrameLoaderClientQt::interruptForPolicyChangeError): (WebCore::FrameLoaderClientQt::cannotShowMIMETypeError): (WebCore::FrameLoaderClientQt::fileDoesNotExistError): (WebCore::FrameLoaderClientQt::callErrorPageExtension): (WebCore::FrameLoaderClientQt::dispatchDidFailProvisionalLoad): (WebCore::FrameLoaderClientQt::dispatchDidFailLoad): * WebCoreSupport/FrameLoaderClientQt.h:
| | * | | Fix translation strings.Frans Englich2009-10-017-349/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change cleans up schema translation comments by having customary copy editing for sentences: starts with a capital letter and ends with a full stop. Pointed out by Friedemann. Reviewed-by: Friedemann Kleint
| | * | | Silence compiler warning.Frans Englich2009-10-011-1/+1
| | | | |
| | * | | Revert "Fix for Symbian window activation/focus problem."Jani Hautakangas2009-10-011-59/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit fafd16474aee5bbf47ee37e1ba739f3b3ceb9c33.
generated by cgit v0.12 at 2024-11-02 08:28:58 (GMT)