summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-1638-53/+52
|\
| * Move audio and video examples into the common multimedia directory.Andrew den Exter2009-10-1638-53/+52
| | | | | | | | | | | | | | | | | | Brings the video examples into multimedia directory, and removes the audio sub-directory so the directory structure is in line with the other example categories. Task-number: QT-667 Reviewed-by: Kurt Korbatits
* | Implement the strength parameter for OpenVG colorize filtersRhys Weatherley2009-10-163-54/+40
|/ | | | | Task-number: QT-2016 Reviewed-by: trustme
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-151-7/+59
|\
| * Allow setting DFBDisplayLayer background colorAnders Bakken2009-10-151-7/+59
| | | | | | | | | | | | | | | | | | | | We already have an option for setting the background color of the primary surface when running with NO_WM. Reuse the same option for allowing users to set the background color of the primary layer. Also fix the regexp. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Remove unnecessary QWSGLPaintDevice now that we have QGLPaintDeviceRhys Weatherley2009-10-157-178/+2
|/ | | | Reviewed-by: Tom
* Don't trust layer when using window_as_cursorAnders Bakken2009-10-151-1/+1
| | | | | | | | | When using QT_DIRECTFB_WINDOW_AS_CURSOR it's likely that the layer doesn't properly support the mouse. Seeing as one might still very well have layer support for windows I can't tie the event parsing solely to NO_DIRECTFB_LAYER. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Use the fallback icon theme name, if the system icon theme name can not be ↵Robert Griebl2009-10-151-0/+4
| | | | | | | | determined. This restores the behavior from before the the gui plugin merge. Reviewed-by: Olivier Goffart
* Make QT_DIRECTFB_SUBSURFACE an opt-in optionAnders Bakken2009-10-152-3/+3
| | | | | | | | | Previously you had to define QT_NO_DIRECTFB_SUBSURFACE to prevent Qt from using subsurfaces for locked surfaces. Now make the default be QT_NO_DIRECTFB_SUBSURFACE and rather allow people to define QT_DIRECTFB_SUBSURFACE to use this option. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Sub-attaq : Don't let user move the boat with the mouse.Alexis Menard2009-10-151-1/+1
| | | | Reviewed-by:TrustMe
* Fix a problem with QDirectFBScreen::instanceAnders Bakken2009-10-152-6/+12
| | | | | | | | If using a proxy screen QScreen::instance() will not return a QDirectFBScreen but rather a QProxyScreen. This patch lets QDirectFBScreen::instance hold its own pointer. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Fix themed icon loader on DEs other than KDE and Gnome.Robert Griebl2009-10-151-0/+2
| | | | | | Make sure that we at least try to load an icon via the "hicolor" theme. Reviewed-by: Olivier Goffart
* Small fixes in Polish translationJarek Kobus2009-10-153-14/+14
|
* Merge commit 'origin/4.5' into origin/4.6Olivier Goffart2009-10-154-14/+53
|\ | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/network/access/qhttpnetworkconnection.cpp src/opengl/qgl_qws.cpp src/opengl/qglpixelbuffer_egl.cpp
| * 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
| * 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.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-151-1/+1
|\ \
| * | Default section size is taken instead of some fixed valueninerider2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | Test failed on different styles such as Windows Mobile. Reviewed-by: Ossi
* | | Removed Symbian exemption from adding QtUiTools to browser demo.Miikka Heikkinen2009-10-151-1/+1
|/ / | | | | | | | | | | | | | | The exemption was originally added to make the demo compile when QtUiTools was not yet compiled for Symbian. Task-number: QT-1018 Reviewed-by: Janne Anttila
* | Merge commit 'a814aba657288942b5beed70a2110446420f981c' into origin-4.6Olivier Goffart2009-10-1519-916/+1206
|\ \
| * \ Merge commit origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-1543-1896/+3999
| |\ \
| * | | Compile tests under WindowsOlivier Goffart2009-10-152-2/+2
| | | |
| * | | stabilize QTableView test on cocoaOlivier Goffart2009-10-141-1/+3
| | | |
| * | | Disable tst_QTableView::tabFocus to work when qt_tab_all_widget is disabledOlivier Goffart2009-10-142-5/+12
| | | | | | | | | | | | | | | | | | | | Logic copied from the QMenu test Also do the same in the QButtonGroup test
| * | | Split QFileDialog auto-tests in two separate dirs. This will allow slowAlexis Menard2009-10-143-867/+1033
| | | | | | | | | | | | | | | | | | | | | | | | machines to complete those tests before being killed by pulse. Reviewed-by:TrustMe
| * | | Merge origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-1498-25573/+30439
| |\ \ \
| * | | | Make the test working on random directories so we are sure there wasAlexis Menard2009-10-141-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no crap before. Reviewed-by:ogoffart
| * | | | Make the autotest pass for descending order in QTableWidgetPierre Rossi2009-10-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It failed after this commit: 19030e2af098e319e3c3f3883c51e28364bf3ccf Reviewed-by: ogoffart
| * | | | Compile the QTableView test on MacOlivier Goffart2009-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Gabriel
| * | | | Sorting bug in QTableView fixPierre Rossi2009-10-132-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the DisplayRole is identical for two or more items, any modification of one item (e.g. backgroundColorRole) may trigger a re-ordering, which is obviously not an behaviour to be expected. Same fix as the one used for QTreewidget in c9eacfa1c791e2d228a3c8f0c119d02d7f46ee02. Task-number: QTBUG-4856 Task-number: 262056 Reviewed-by: Olivier Goffart
| * | | | Fix sorting after changing a QTableView's headerOlivier Goffart2009-10-132-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the sorting states in sync with the header when setting custom headers Reviewed-by: Gabriel Task-number: QTBUG-3128 task-number: 234926
| * | | | Fix some of the QWidget test on CocoaOlivier Goffart2009-10-131-14/+3
| | | | |
| * | | | Fix graphicsview test on Cocoa.Olivier Goffart2009-10-132-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cocoa doesn't support regions update and always update the bounding rect (see comment in QWidgetPrivate::update_sys in qwidget_mac.cpp) Change tests that checked that we get the exact regions. Reviewed-by: MortenS
| * | | | Fixes tst_QGraphicsProxyWidget::setWidget_simple on MacOlivier Goffart2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the palettePropagation test tests that the palette does not propagate from the widget to the proxy. And on Mac, the default palette for the line edit is not the same as the default palette Reviewed-by: Alexis
| * | | | Fix QUrl regression with setHost("::ffff:129.144.52.38")David Faure2009-10-132-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toEncoded was returning an empty host instead of [::ffff:129.144.52.38] Merge-request: 1735 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | | | QMetaObject::activate: reordered mutex locks/unlocks around spyFlorian Vichot2009-10-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always call the callbacks unlocked to avoid deadlocks. (The others call to the callback ar unlocked) Reviewed-by: Olivier Goffart Merge-request: 1744
| * | | | Itemview: fix regression concerning Ctrl+rubber band selectionsFrank Reininghaus2009-10-132-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When making a rubber band selection while Control is pressed in an itemview with extended selection, make sure that the selection state of the items inside the rubber band is toggled. This ammend commit 0644e3dce532b1df00a77d3a30c61d6b75d3ff30 Merge-request: 1759 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Reviewed-by: Gabriel Task-number: QTBUG-1435 Task-number: 191545
* | | | | doc: Changed \reimp to \internal because base class version is.Martin Smith2009-10-152-2/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4599
* | | | | QSslSocket: Documentation enhancementMarkus Goetz2009-10-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify about bytesWritten() and encryptedBytesWritten() Reviewed-by: David Boddie
* | | | | Made Mac Cocoa use the input method hints when deciding on IM.axis2009-10-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New behavior is to turn them off when inputting numbers or hidden text, which is the way it was in Qt 4.5. Task: QT-1938 Task: QT-2257 RevBy: Prasanth Ullattil
* | | | | QNAM HTTP Code: Proceed POSTing on encryptedBytesWritten()Markus Goetz2009-10-152-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... not only on bytesWritten() Reviewed-by: Peter Hartmann
* | | | | compile fix with namepaceshjk2009-10-153-0/+6
| | | | |
* | | | | Fix pointer grab issues in S60Shane Kearns2009-10-151-56/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Did the long awaited "refactor me" in QSymbianControl::HandlePointerEvent Pointer is grabbed by MousePress, and released by MouseRelease - unless already globally grabbed. Pointer events are routed to the widget that grabbed the mouse. Task-number: QTBUG-4695 Task-number: QTBUG-4674 Reviewed-by: axis
* | | | | fix compilation with namespaceshjk2009-10-151-2/+6
| | | | |
* | | | | doc: Clarified when setDefaultFormat() is ignored by constructors.Martin Smith2009-10-151-9/+15
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4443
* | | | | Compile on Carbon.Morten Johan Sørvig2009-10-151-0/+4
| | | | | | | | | | | | | | | | | | | | ifdef out QCocoaPrintPanelDelegate.
generated by cgit v0.12 at 2025-08-25 23:22:02 (GMT)