summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix a freeze in QFileDialog (Mac)Cédric Luthi2009-11-021-1/+1
| | | | | | | Running an open file dialog, for example with QFileDialog::getOpenFileName() can lead to a freeze if the user selects a folder, then selects a file in the parent folder and finally confirms the open dialog. Merge-request: 1327 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Increase PowerVR memory alignment from 8 to 32 for SGX systems.Rhys Weatherley2009-11-011-1/+1
| | | | | | Increasing the alignment does not seem to affect MBX. Back port of 7997279bc22d30bf1d1a30a567bda33ecc9aeb2d
* The shipped pvr2d.h/wsegl.h for PowerVR do not work with MBXRhys Weatherley2009-11-011-3/+4
| | | | | | Reviewed-by: trustme Back port of 4ae09215de36fcfd17dc6875aca102d784d65012
* Remove unnecessary PowerVR helper functionsRhys Weatherley2009-11-012-75/+0
| | | | | | | | | The cross-process memory sharing code never really worked in the way we needed it to - so remove it until something better comes along. Reviewed-by: trustme Back port of 04648b44f0784223122a782320d0b09b5c1e9497
* Make screen rotation work properly with the PowerVR screen driverRhys Weatherley2009-11-019-9/+162
| | | | | | | Task-number: QT-2261 Reviewed-by: Tom Back port of 75719e4e06882825fe056935d782b4153bf0ac5b
* Avoid infinite loop when laying out text with unconvertible charsEskil Abrahamsen Blomfeldt2009-10-292-40/+51
| | | | | | | | | | | | | | | | | | | | | | | | | When the stringToCMap() fails, it can be because it did not have enough space in the layout, or it can because of other errors. In order to implement "try-again" processing in a simple way, we had an infinite loop which assumed that stringToCMap() would always succeed in the second run (which would be the case if the only possible error was "not enough space".) Since there are other possible failures not related to the number of glyphs, you could easily get into an infinite loop here, e.g. when laying out text that contains the Byte Order Mark. The fix changes the implementation to explictly try stringToCMap() twice at max, and is also how it's implemented in the default qtextengine.cpp. Task-number: QTBUG-4680 Reviewed-by: Trond Conflicts: src/gui/text/qtextengine_mac.cpp tests/auto/qtextlayout/tst_qtextlayout.cpp
* Plug some autorelease pool leaks.Norwegian Rock Cat2009-10-291-0/+2
| | | | | | | | Calling QWidget::setCursor() outside of the event loop causes a memory leak in Cocoa. Adding an autorelease pool plugs it. Merge-request: 1791 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Memory of fixedKernel is never returned, found by cppcheck.Daniël2009-10-271-0/+1
| | | | | | Cherry-picked from d8a2e52e Merge-request: 419 Reviewed-by: Olivier
* QWidget painting regression on Windows.Bjørn Erik Nilsen2009-10-221-1/+1
| | | | | | | | | | | | | | Problem occurred on Windows due to a call to repaint() on a top-level window from setDisabledStyle() in qwidget.cpp. This function is called whenever a window is blocking. In this particular case the children of the repainted window are opaque, and should therefore not be repainted, which also means that the top-level have to subtract the region of the opaque children when filling the background. This region is cached, and the problem was that the cached region was wrong. It was wrong because it was not invalidated properly. Task: QTBUG-4245 Reviewed-by: Paul
* QWindowsMobileStyle::drawPrimitive(PE_Frame) background color fixedJoerg Bornemann2009-10-221-4/+2
| | | | | | | | The background color of PE_Frame was palette().light() and has been changed to use palette().background() now. This fixes the autotest tst_QStyleSheetStyle::task188195_baseBackground for Windows mobile. Reviewed-by: thartman
* move default QAbstractButton font setup on Win mobile to QApplicationJoerg Bornemann2009-10-222-24/+3
| | | | | | | | The original approach of modifying the font for QAbstractButtons in QWindowsMobileStyle::polish broke the autotest tst_qstylesheetstyle::fontPropagation. Reviewed-by: thartman
* tst_qsslsocket: new bigChunk testcaseMarkus Goetz2009-10-201-0/+45
| | | | | | | | | | This new test is to find out if the BIO size of OpenSSL is limited or not. The test passes on my Linux, however the OpenSSL docu suggests that the BIO size is limited. From http://www.openssl.org/docs/crypto/BIO_s_bio.html "This is currently 17K". Reviewed-by: Peter Hartmann
* make missing Key_Back and Key_Forward menu glyphs return 0 on mac(cocoa)Dean Dettman2009-10-201-2/+2
| | | | | | | | | This is an addition to commit 5651d2547261ccecbf50f8141c634f59c0adc00d to make it obvious that in cocoa nothing is returned. Task-number: QTBUG-4873 Reviewed-by: MortenS
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.5Dean Dettman2009-10-2014-159/+166
|\
| * Add a up/down benchmark to benchmarks/qnetworkreplyMarkus Goetz2009-10-201-1/+38
| | | | | | | | Reviewed-by: Peter Hartmann
| * Backport benchmarks/qnetworkreply to 4.5Markus Goetz2009-10-203-0/+88
| | | | | | | | Reviewed-by: TrustMe
| * QNetworkProxyFactory: Never return empty list on windowsMarkus Goetz2009-10-161-1/+6
| | | | | | | | | | Task-number: Salesforce 00062670 Reviewed-by: Thiago
| * Recognize transformed screens when looking for a QGLScreenRhys Weatherley2009-10-162-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | If the QWS_DISPLAY is specified as "Transformed:powervr:...", then we will encounter QScreen::TransformedClass rather than QScreen::ProxyClass when searching for the QGLScreen. This change makes the code search for both. Task-number: QT-2261 Reviewed-by: Sarah Smith Back port of 8e4fa6e87f74cfb3457e8270a361cf30ca7d3593
| * Some sub menus are disabled in CocoaPrasanth Ullattil2009-10-151-2/+2
| | | | | | | | | | | | | | | | The commit faec535829a0e454a6784b0c5c37cb63e7da8f73 introduced this bug. Since we can add a submenu to the same supermenu, we should consider it before disabling the submenu who already have a supermenu. Reviewed-by: MortenS
| * 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
* | Adds Key_Back and Key_Forward menu glyphs on mac(carbon)Dean Dettman2009-10-201-0/+8
|/ | | | | | | | | This change improves the behavior of QMenu when Key_Back and Key_Forward are used as shortcuts. A dotted arrow appears on carbon, and on Cocoa the image is blank, instead of undefined as it was before. Task-number: QTBUG-4873 Reviewed-by: msorvig
* 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
* 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
* 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
* 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
* 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)
* 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
* 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
|\
| * 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
| * Update changes file for 4.5.3 for DirectFBAnders Bakken2009-09-291-3/+14
| | | | | | | | | | Reviewed-by: TrustMe (cherry picked from commit 390c40d7d2bbc622e18aa1c096d0b5fee5a04344)