summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-0637-353/+317
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * Merge branch '4.5'Bill King2009-08-054-12/+35
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * Make file extension case insensitive with the Gtk+ file dialogJens Bache-Wiig2009-08-041-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt dialog treats extension filters as case insensitive where the default behavior of the Gtk+ file dialog is to be case sensitive. The GtkFileFilter allows only simple glob syntax to be used so we basically rewrite the extension string from .xyz to .[xX][yY][zZ]. Task-number: 259155 Reviewed-by: joao
| | * Fix indentation.Alexis Menard2009-08-041-1/+3
| | | | | | | | | | | | Reviewed-by:TrustMe
| | * Fix ancestor flags that are not correctly update when reparenting.Alexis Menard2009-08-041-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | updateAncestorFlags was not reseting the flags if you change the parent that have for instance itemsClipChildrenToShape to a new one that doesn't have that flag. Task-number:258956 Reviewed-by:bnilsen
| | * Preserved fill rule for perspective mapped strokes in raster engine.Samuel Rødal2009-08-032-0/+3
| | | | | | | | | | | | | | | Task-number: 254407 Reviewed-by: Gunnar
| * | Fix compilation after my last change to qobject_p.hThiago Macieira2009-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | I renamed deletionNotification back to its original name. I had forgotten that QWidget needed a similar change. Reviewed-by: Trust Me
| * | Fixed bug where Q[Styled]ItemDelegate edition wouldn't terminate whenGabriel de Dietrich2009-08-042-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | the item lost focus to an unrelated dialog. The tests against the active modal window was unnecessary. Task-number: 257859 Reviewed-by: olivier
| * | qregext filter changed to support additional parameter/unicodeMatthew Cattell2009-08-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed the QRegExp filter back to the old form plus an additional piece to allow international characters. the new regular expression now allows a file type filter to contain a bracketed description prior to the filter set itself. 259105 Andy Shaw
| * | Reorganise QObjectPrivate so that it's easier to tell what's in it.Thiago Macieira2009-08-041-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename QDeclarativeData to QObjectDeletionNotification, since it has no relation to declarative UI. It's just notification of the object's deletion. Make the destructor non-inline and place it in qobject.cpp, so that the virtual table is emitted there and exported from QtCore. Also move the QObjectData destructor to qobject.cpp. This means you cannot create any class deriving directly from QObjectData outside QtCore, which is the intention anyways (it's a private class and only QObjectPrivate derives from it). Reviewed-by: Bradley T. Hughes
| * | Removed the startPos/lastPos/pos from the gesture classes.Denis Dzyubenko2009-08-046-118/+6
| | | | | | | | | | | | | | | | | | | | | | | | It doesn't make much sense to have that low-level info neither in the base QGesture class, nor in the QPanGesture, as the latter one has offset properties instead. Reviewed-by: trustme
| * | Removed the QTapAndHoldGestureDenis Dzyubenko2009-08-043-115/+16
| | | | | | | | | | | | | | | | | | | | | | | | Moved the gesture implementation to the imageviewer example as it cannot be fully implemented in a crossplatform way - for example on Windows tap and hold is a system gesture that is transparent to the application. Reviewed-by: trustme
| * | Moved the native window gesture handling code to the right place.Denis Dzyubenko2009-08-046-77/+121
| | |
| * | Renamed internal WinGesture event to NativeGesture.Denis Dzyubenko2009-08-045-17/+25
| | | | | | | | | | | | | | | | | | | | | It will also be used on Mac, so it doesn't make sense to keep it windows specific. Reviewed-by: trustme
| * | Fix build on HarmattanTom Cooksey2009-08-041-4/+7
| | |
| * | Added input hints to QGraphicsItem.jasplin2009-08-043-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows for input hints to be set on a QGraphicsItem. Input methods use such hints to define its appearance/behavior (e.g. to allow for numerical input only). Reviewed-by: ahanssen Task-number: 254493
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-08-0421-201/+199
| |\ \
| | * | fix warning on MSVCThierry Bastian2009-08-041-2/+1
| | | |
| | * | QMenu now takes minimum width into account for the action rectsThierry Bastian2009-08-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The action now try to take advantage of the space given by a minimum width. Patch proposed initially by Aron Seigo and improved later on. Reviewed-by: Trustme
| | * | Fixes selectionModel::hasSelection return value after model::resetLeonardo Sobral Cunha2009-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After resetting the model, the selectionModel::hasSelection() of the view should return false. Fixed the corresponding autotest, which was wrong. Task-number: 256502 Reviewed-by: thierry
| | * | fix warnings on mingw (gcc4.4)Thierry Bastian2009-08-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | basically reordering members initialization in constructors or fixing singed/unsigned checks. Reviewed-by: Trustme
| | * | Mac: Remove debug work outputRichard Moe Gustavsen2009-08-041-1/+0
| | | |
| | * | Add support for pan gesture on mac (carbon and cocoa)Richard Moe Gustavsen2009-08-042-0/+70
| | | |
| | * | Fix incorrect license headers.Jason McDonald2009-08-046-30/+30
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Fix obsolete license headersJason McDonald2009-08-043-6/+6
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | have QPainter::begin() return false on null paint engineGunnar Sletta2009-08-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
* | | | Merge commit 'origin/master'Jason Barron2009-08-065-72/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * \ \ \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-053-31/+37
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-0523-326/+320
| | |\ \ \ \
| | * | | | | memory leak fix in standardItemModel found during combo box testingmread2009-08-052-13/+11
| | | | | | |
| | * | | | | protecting against leak in QSymbianControl when QWidget construction failsmread2009-08-051-18/+26
| | | | | | |
| * | | | | | Implemented QDesktopServices TODOs, and fixed coding style deviations.Janne Anttila2009-08-052-41/+47
| | |/ / / / | |/| | | |
* | | | | | Compile with Q_DECLARE_SCOPED_PRIVATE.Jason Barron2009-08-044-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These classes were moved so they were not updated correctly when I did the merge.
* | | | | | Merge commit 'origin/master'Jason Barron2009-08-04260-972/+1122
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | | | | Trailing whitespace and tab/space fixes for src/guiJanne Anttila2009-08-0423-327/+321
| |/ / / /
| * | | | CFbsBitmap::DataSize() seems to be a private Api function.Alessandro Portale2009-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But CFbsBitmap::Header().iBitmapSize seems to do the same job, and it works wit hthe public SDK. Thanks to jbarron for finding that public pendant.
| * | | | fixed qt_pixmapToNativeBitmap name merge problemmread2009-08-031-4/+4
| | | | |
| * | | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-03251-658/+798
| | | | | | | | | | | | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * | | | Restored window title after another top-level window was closed.Janne Anttila2009-07-311-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 249995 The window title in S60 is global entity, i.e. is located in application status pane. When top level window, for example mesage box is closed, the window title has to be restored for window which is getting the focus. This way we don't leave title from destroyed window to title bar. It is also into question, whether the non-maximized dialogs should set title to statuspane at all. For now they will, but things may change if we switch to use native dialogs.
| * | | | Removed unnecessary code, UID is associated to wserv by framework.Janne Anttila2009-07-311-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was inialy added before we had s60main. Since that time we did not had S60 application framework classes constructed we had to associate application UID to wserv manually to get fast swap window (FSW) working correctly. Now application frameworks take care of associating the UID to wserv window group.
| * | | | Swicthed back to original way of using AddToStackL and RemoveFromStackJanne Anttila2009-07-301-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 258504 This commit fixes the problem that background widgets do not get orientation change events, and thus will not be correctly layouted after the foreground windget is closed. See also: c17c1c101cbe09d4c6149ef8e76a9bb792222456 At the time when commit c17c1c101cbe09d4c6149ef8e76a9bb792222456 was created there were no SetFocus calls in hide_sys and show_sys. I think that has been the root cause why focus change event has not been generated. I.e. hiding a CCoeControl in Symbian (MakeVisible) does not generate focus event but setFocus(false/true) generates. I tried this code with Drilldown example. In city detaisl view the combobox was working fine with keypad navigation. The change had no effects to qcombobox autotest results and qwidget autotest resutls were better on some run and a bit worse on some run. There was variation in 2-4 qwidget autotest results on each run. Note also that screensaver seems to affect to test results.
* | | | | Fix more compile breakages after merging qt/master-stable.Jason Barron2009-08-044-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of the logic was factored out of QLineEdit(Private) and into a private class called QLineControl, however the changes did not compile when keypad navigation is enabled so fix them.
* | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-04109-3316/+5807
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | | | Fixed "Hightlighted menu items not always selected" bug.Gabriel de Dietrich2009-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Menu paintEvent was not called when the mouse cursor lied between the menu item area and the menu frame border. Task-number: 258920 Reviewed-by: olivier
| * | | | Fixed some perspective transform rendering bugs.Samuel Rødal2009-08-034-155/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bugs were caused by not clipping to the near plane (w = 0) when mapping primitives with perspective tranfsorms. Task-id: 258961 Reviewed-by: Gunnar
| * | | | Wizard background images incorrect in Snow Leopard.Prasanth Ullattil2009-08-031-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | We need to clear the QPixmap before the image is drawn using the CGContextDrawImage(). Reviewed-by: Norwegian Rock Cat
| * | | fixed broken integration of qwindowsurface_raster.cppGunnar Sletta2009-08-031-1/+1
| | | |
| * | | Merge branch '4.5'Thiago Macieira2009-08-0313-194/+202
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| | * | Cocoa with namespace breaks the buildRichard Moe Gustavsen2009-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the needed macros around the classnames the way it should be done. Reviewed-by: Prasanth
| | * | Coverty warnings --. This switch was missing a break.Alexis Menard2009-07-301-0/+1
| | | | | | | | | | | | | | | | Reviewed-by:TrustMe