summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-021420-15734/+29182
|\ | | | | | | | | Conflicts: configure.exe
| * 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-028-4/+16
| |/ | | | | | | | | | | | | - 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
| * Test stabilisation on X11Olivier Goffart2009-10-017-12/+18
| | | | | | | | | | | | for the Q3Table one, it sometimes fail with XPASS. There is no point trying to stabilize a failure on a test for a class we are not likely to touch anyway.
| * Merge commit 'origin/4.5' into 4.6Oswald Buddenhagen2009-10-010-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.before tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result tools/linguist/shared/java.cpp
| | * don't ignore first character in each .java fileOswald Buddenhagen2009-10-011-1/+0
| | | | | | | | | | | | backport of 59aa130bb9209aa1809c7bd31f694265eeb1baf1
| | * unscrew line numbers ... again. !@§$#%Oswald Buddenhagen2009-10-017-16/+16
| | |
| * | 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-016-12/+120
| |\ \ | | |/
| | * Fixed Designer property editor selection bug.Gabriel de Dietrich2009-10-012-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * make -{source,target}-language actually override values from filesOswald Buddenhagen2009-10-011-4/+4
| | | | | | | | | | | | -help says it does, and it kinda makes sense
| | * make -help reflect realityOswald Buddenhagen2009-10-011-5/+4
| | |
| | * 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.
| * | fix ts and qm targets for shadow builds and builds with -prefixOswald Buddenhagen2009-10-018-44/+58
| | |
| * | remove *_untranslated.tsOswald Buddenhagen2009-10-0116-20207/+4
| | | | | | | | | | | | | | | | | | | | | with the current scheme of running "make ts" only when doing a particular translation and checking in only the relevant file, these files are never updated. lconvert can generate an empty template from any translation anyway.
| * | remove unused translations.proOswald Buddenhagen2009-10-011-34/+0
| | |
| * | 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
| * | Touch up and fixes for the documentation frontpageJens Bache-Wiig2009-10-014-11/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I reverted the font enlargement. This should be up to the user. - The fonts are now uniform again, giving a more professional apparance. - Added a slight gradient for the headers to give it a more modern look. - Fixed a rendering glitch with webkit where no borders were visible. The qt-resources.qdoc is basically there to export the image. Reviewed-by: Morten Engvoldsen
| * | network selftest: make sure tested file has correct line endingsPeter Hartmann2009-10-011-0/+1
| | | | | | | | | | | | | | | | | | added file to preserver the correct line endings for the test file Reviewed-by: Aleksandar Babic
| * | 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
| * | Doc: Removed the old What's New page for Designer.David Boddie2009-10-011-3/+0
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Removed the old Console edition and updated edition naming.David Boddie2009-10-014-16/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Added a script to generate one of the model/view images.David Boddie2009-10-011-0/+42
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | 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
| | |
| * | Exclude the MMF Phonon plugin folder for qdoc.Frans Englich2009-10-011-0/+1
| | | | | | | | | | | | As done for the other plugins. Brought to attention by Volker.
| * | Doc: RTOS'es are available under a commerical license, without support.Volker Hilsheimer2009-10-012-2/+9
| | | | | | | | | | | | Also point to the right contact-us address.
| * | fix minimizing for Windows CE and Windows mobileJoerg Bornemann2009-10-014-38/+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
| * | oops.. fixed compilation of testThierry Bastian2009-10-011-1/+1
| | |
| * | Try to fix autotestThierry Bastian2009-10-011-4/+5
| | | | | | | | | | | | | | | Also improves a bit the quality of the code by sending the event instead of calling directly the event handler