summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-1511-166/+80
|\
| * Remove the surface holder from the PowerVR screen driverRhys Weatherley2009-10-154-148/+11
| | | | | | | | | | | | | | | | | | The PvrEglSurfaceHolder is a hold-over from Qtopia that isn't needed any more and was never very stable anyway. Reviewed-by: trustme Back port of f613b0170d0fe806378779472315d0bbdc1aada9
| * Back-port several OpenGL/ES fixes from 4.6 to 4.5Rhys Weatherley2009-10-153-5/+14
| | | | | | | | | | | | | | | | | | 8ee6d090d45198fb2530849236c97f014666b7e4: fix EGL_SAMPLES b125af1b298d694c332f56deebe4755d0c985d5d: memory leak of EGLSurface's ef8d9fa7091b0d45fe15aae43b8f1c47547cb16d: double-destroy of pbuffer 73d9dced8298dfad7bc72607146e81e96fffb6d4: suppress pbuffer warnings Reviewed-by: Donald Carr
| * QNAM HTTP Code: Backport a fix related to aborting repliesMarkus Goetz2009-10-141-1/+4
| | | | | | | | | | | | | | | | Backport af71faf8cb2c9cbf34c408b81ce7ae1ef6c6403e from 4.6 to 4.5. Task-number: 261999 Reviewed-by: Peter Hartmann
| * Fix regression while updating items in itemview.Olivier Goffart2009-10-132-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | geometry() is in parent coordinate. We want the coordinate in viewport coordinate. There is an offset (the header geometry) between the two. So the first item was not refreshed. (Regression because of e5b32fbe0efc8 and a54c18e27bbb) Reviewed-by: Gabriel Reviewed-by: Alexis Task-number: QTBUG-4849
| * Fix a crash in cocoa when a QMessageBox is destroyed from dropEvent()Prasanth Ullattil2009-10-121-11/+11
| | | | | | | | | | | | | | | | | | The gobal variable which stores the current mouse event can be updated before dragImage() call(blocking) is finished. So make a local copy of the information required by the QDragManager::drag(). Task-number: QTBUG-4814 Reviewed-by: MortenS
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-128-21/+29
|\ \ | |/
| * Back port fixes from PowerVR driver in 4.6 to 4.5Rhys Weatherley2009-10-093-9/+16
| | | | | | | | | | Pre-multiply fix: 01a671ff0bd380e5cff311cc233352c867a041a0 Painting performance: c3cfba7295c990d8135e1dd70b8cdbefd25615ab
| * Fix detection of pbuffers on OpenGL/ES systemsRhys Weatherley2009-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code was searching for an exact pbuffer format of RGBA = 1, 1, 1, 0, which of course is never going to happen. Instead, search for the best format. Reviewed-by: trustme Conflicts: src/opengl/qglpixelbuffer_egl.cpp Back-port of 46843022acd7322c42a98858ec52b65ce7451d06
| * QHeaderView: fixed the sizeHint with hidden sectionsThierry Bastian2009-10-071-4/+8
| | | | | | | | | | | | | | We used to check the 100 first sections and 100 last sections Now we make sure we check 100 visible sections Task-number: 255574
| * ignore invalid WM_KEYDOWN messages on WindowsJoerg Bornemann2009-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For some strange reason, I get the following message if I press a non-numerical key on the SIP of a Samsung Omnia device, running Windows mobile 6.1: WM_KEYDOWN wParam == 0 lParam == 1 That message is invalid. We must ignore it. Reviewed-by: mauricek
| * fix ts and qm targets under windowsOswald Buddenhagen2009-10-071-4/+1
| |
| * Fix ASSERT caused by Plastique style when setting an application font with a ↵Bradley T. Hughes2009-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | pixel size Use QFontInfo to query the pointSize() instead of asking the font directly, fixing this assert: ASSERT failure in QFont::setPointSize: "point size must be greater than 0", file text/qfont.cpp, line 855 Task-number: QTBUG-3555 Reviewed-by: Simon Hausmann
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-078-15/+141
|\ \ | |/
| * Autotest: add a few more tests, with IP address and actual hostnameThiago Macieira2009-10-061-4/+74
| |
| * Autotest: use port 12346 instead of 1, to ensure that it's not aThiago Macieira2009-10-061-2/+7
| | | | | | | | | | | | firewall issue Also check if we're not timing out instead of being able to fail.
| * tst_QGraphicsItem::QTBUG_4233_updateCachedWithSceneRect WinCE fixJoerg Bornemann2009-10-061-1/+1
| | | | | | | | | | | | We need some more time on Windows mobile to receive all events. Reviewed-by: thartman
| * tst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fixJoerg Bornemann2009-10-061-0/+1
| | | | | | | | | | | | | | | | We must make sure that the graphics view scene is centered to make this test work. On Windows mobile, the widget was too wide and the scene wasn't centered. Reviewed-by: thartman
| * tst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobileJoerg Bornemann2009-10-061-0/+2
| | | | | | | | | | | | | | This test depends on a layout spacing set to 6. The Windows mobile style has layout spacing 8. Reviewed-by: mauricek
| * Autotest: disable the globalObjects test.Thiago Macieira2009-10-061-0/+1
| | | | | | | | | | We are not going to fix this in 4.5. I doubt we'll fix it in 4.6 either, so I'll reenable it for 4.7 only.
| * tst_QCssParser::extractFontFamily fix Windows CE font deploymentJoerg Bornemann2009-10-062-3/+38
| | | | | | | | | | | | | | On Windows mobile we usually don't have the "Times New Roman" font. Thus we must deploy and register it, if its not available. Reviewed-by: mauricek
| * fix tst_QAbstractItemView::task250754_fontChange for Windows CEJoerg Bornemann2009-10-061-5/+17
| | | | | | | | | | | | | | We need to give Windows mobile some more time to handle all internal timer events. Otherwise QTreeView::updateScrollBars doesn't get called. Reviewed-by: mauricek
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-0612-17/+142
|\ \ | |/
| * Fixing the autotest for other platforms, hopefully...João Abecasis2009-10-051-1/+1
| | | | | | | | Reviewed-by: Joerg Bornemann
| * tst_QComboBox::task248169_popupWithMinimalSize() fixed for WinCEninerider2009-10-051-2/+4
| | | | | | | | | | | | | | Changed the absolute size values for the combobox to desktop dependent sizes. Reviewed-by: Joerg
| * Bump version number of 4.5 branch to 4.5.4.Jason McDonald2009-10-0511-15/+138
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-053-31/+112
|\ \ | |/
| * Fix regressions in qeventloop, qtimer, and qsocketnotifier autotestsBradley T. Hughes2009-10-053-31/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit ed375675d4a4f6fd63edeb242e23c87b3de4be6f triggers a behavior in Glib's mainloop implementation where some event sources are not "serviced" every iteration of the mainloop context. This breaks an invariant that many tests relied on, so we need to solve the problem. The invariant is that a newly added timer that would normally fire on the next pass of the event loop (liker a zero timer) SHOULD actually fire. We do this by registering 2 timer event sources with Glib's mainloop: one normal priority source and one idle priority source. The idle priority source is the one that will send events most of the time, with the normal priority one taking over only when processEvents() is called manually. Task-number: QT-877 Reviewed-by: jbache Reviewed-by: thiago Reviewed-by: denis (cherry picked from commit d0d0fdb8e46351b4ab8492de31e5363ef6662b57)
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-054-0/+59
|\ \ | |/
| * Fix a bug when clipsChildrenToShape is set back to false.Alexis Menard2009-10-024-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | If you set the flag itemClipsChildrenToShape to true on a parent, an optimization was made in 4.5.0 to not add children of this parent in the index. But when you set the flag back to false all the sub-tree of the parent should be re-added to the index otherwise the index will never find all children. This code is not relevant for 4.6 since the index part of QGraphicsView has been refactored and handle this case with itemChange in QGraphicsSceneIndex. Reviewed-by:andreas
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-0212-24/+110
|\ \ | |/
| * 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 Back port of 53b3a0572242d0a425e74848afba1293f195d29b
| * Merge commit 'v4.5.3' into 4.5Thiago Macieira2009-10-010-0/+0
| |\
| * | 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
| | |
| * | 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
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-013-9/+17
|\ \ \ | |/ /
| * | 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
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-015-1456/+1164
|\ \ \ | |/ /
| * | 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 locale encoding in XLIFF filesAndy Shaw2009-09-301-4/+11
| | | | | | | | | | | | | | | | | | xlf uses xx-YY notation instead of xx_YY Reviewed-by: ossi
| * | Fix reader.google.com crashesSimon Hausmann2009-09-303-1450/+1133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert this change: ---- 2008-12-18 Bernhard Rosenkraenzer <bero@arklinux.ch> Reviewed by Darin Adler. https://bugs.webkit.org/show_bug.cgi?id=22205 Fix compatibility with bison 2.4, partially based on older patch by Priit Laes <amd@store20.com> * WebCore/css/CSSGrammar.y: Made compatible with bison 2.4 ----- Cherry-picked from qtwebkit.git 4.5 repository/branch with commit 23d13ba45ee59379c04afdef8472acc8611bb36a
* | | Merge branch '4.5.3' into 4.5Jason McDonald2009-10-010-0/+0
|\ \ \ | | |/ | |/|
| * | Remove mentions of QtSW.v4.5.3Jason McDonald2009-09-292-3/+3
| | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit aa65b608b96f0b41e96093e6eb26ccc0f301afc9)
| * | Remove mention of QtSW.Jason McDonald2009-09-291-1/+1
| | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 36623ef3b5d3804de2ced689af2329c9ab81c265)
| * | Tidy the changes file for 4.5.3.Jason McDonald2009-09-291-99/+24
| | | | | | | | | | | | Reviewed-by: Trust Me