summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-graphicseffect' of ↵Rhys Weatherley2009-07-249-435/+456
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-graphicseffect
| * Make QGraphicsEffect independent of QGraphicsItem.Bjørn Erik Nilsen2009-07-248-268/+266
| | | | | | | | | | | | This makes it possible to basically implement support for graphics effects on pretty much everything, e.g. QWidget. We currently only support effects on QGraphicsItem, but there's more to come :-)
| * QGraphicsEffect API cleanup.Bjørn Erik Nilsen2009-07-237-203/+226
| |
* | Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shadersRhys Weatherley2009-07-2336-269/+743
|\ \ | |/ |/| | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * Initial stab at a custom shader stage APITom Cooksey2009-07-231-0/+1
| |
| * Fix merge error, restore size of bit field.Andreas Aardal Hanssen2009-07-231-2/+2
| | | | | | | | | | | | | | | | | | Change 34fde4a4 removes one bit from the flags bitfield, which was added in change 7bc98d7b. This happened during resolving of a merge conflict and caused some input method related autotests in tst_QGraphicsView to fail. Reviewed-by: mbm
| * Add QGraphicsItem::focusProxy(), focus proxy support.Andreas Aardal Hanssen2009-07-235-48/+141
| | | | | | | | | | | | | | | | | | Following QWidget's behavior, you can not assign any item in the same scene as a focus proxy for another item. Also supports nested focus proxies. You can only assign items in the same scene as focus proxies. Autotests are included. Reviewed-By: mbm
| * Add the math3d types to QVariantRhys Weatherley2009-07-2311-25/+407
| | | | | | | | Reviewed-by: Sarah Smith
| * Merge branch '4.5'Thiago Macieira2009-07-222-22/+22
| |\
| | * Revert "Added a check that X11 timestamp goes forward only."Denis Dzyubenko2009-07-221-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases we might get an invalid timestamp that is far away in the future, so remembering it will break all consequent X calls that require a timestamp because it just contains junk (for example clipboard will stop working). This happens with XIM+SCIM pair - whenever we start input method and type something to the widget, we get a XKeyPress event with a commited string, however the 'serial' and 'time' members of the XEvent structure are not initialized (according to valgrind) and contain junk. This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb. Reviewed-By: Brad
| | * Fix table borders in multiline tables when printing to PostScript.Gunnar Sletta2009-07-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not all to happy with this fix, but its the best that one can acheive given the current design. The problem is that QPdfBaseEngine sets a number of states as part of updateState(), but only when we are playing back through the alpha engine. These states are used in some draw functions, also when we are recording in the alpha engine. This leads to the states and their checks being out of sync. So to follow the existing pattern in the code we need to not touch d-> vars prior to a check to usesAlphaEngine. Reviewed-By: Eskil
| * | Compile on embeddedOlivier Goffart2009-07-222-2/+2
| | |
| * | Merge commit 'origin/4.5'Olivier Goffart2009-07-221-2/+4
| |\ \ | | |/
| | * Fix memory leak.Olivier Goffart2009-07-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | The signal could be connected a huge number of times This is already fixed in master with Qt:UniqueConnection Task-number: 258381
| | * Update documentation for QMessageBox::open().Norwegian Rock Cat2009-07-221-2/+4
| | | | | | | | | | | | | | | | | | I had missed this one in my rounds of updates. Bad me. Reviewed-by: Thorbjorn
| * | Merge commit 'origin/4.5'Olivier Goffart2009-07-221-1/+2
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qt_cocoa_helpers_mac_p.h
| | * Fix a potential crash due to the fact that _q_UpdateIndex() is reenteredAndy Shaw2009-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is confirmed to resolve a number of problems from the original reportee. It's already fixed in Qt 4.6 in a more wider fix, but this one liner is a good to have in Qt 4.5.x anyway. Task-number: 258194 Reviewed-by: alexis
| | * Another fix needed to build in a namespace on Mac with -arch ppcAndy Shaw2009-07-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Don't know how this got lost in the original submit since I had added both. Task-number: 257080 Reviewed-by: nrc
| * | Show text even if maximum == 0Olivier Goffart2009-07-221-1/+1
| | |
| * | Support for very large range in QProgressBarOlivier Goffart2009-07-224-9/+8
| | | | | | | | | | | | | | | | | | Regression since my last commit. Task-number: 152227
| * | Simplify the computation of the QProgressBar progress.Olivier Goffart2009-07-223-8/+7
| | | | | | | | | | | | | | | | | | | | | This is also a work around for a bug in gcc on powerpc (embedded-linux) Task-number: 258358 Reviewed-by: jbache
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtRhys Weatherley2009-07-2211-159/+152
| |\ \
| | * | Fixed compile with -qtnamespace and MSVC.Rohan McGovern2009-07-221-4/+6
| | | | | | | | | | | | | | | | | | | | When an extern function is declared in the scope of another function, MSVC sometimes ignores the enclosing namespace {}.
| | * | Doc: documentation for boolean properties should say what happens whenVolker Hilsheimer2009-07-211-5/+7
| | | | | | | | | | | | | | | | the property is set, not what doesn't happen when the property is not set.
| | * | Doc: make potentially incorrect overloads obsolete.Volker Hilsheimer2009-07-212-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | Also add additional overload. Reviewed-by: Andreas
| | * | Doc: document reimplementations of internal functions as internal.Volker Hilsheimer2009-07-211-4/+4
| | | |
| | * | Doc: More docu for the QPixmapCache::KeyVolker Hilsheimer2009-07-211-1/+13
| | | |
| | * | Remove unused gesture related defines and structuresBradley T. Hughes2009-07-212-101/+56
| | | | | | | | | | | | | | | | | | | | We don't use all of them. I also changed the typedefs for the touch related functions to follow the same naming convention.
| | * | LayeredPane should not be reported as an IP address edit control to MSAAJan-Arve Sæther2009-07-212-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason was that ROLE_SYSTEM_IPADDRESS = 0x3F has been added to MSAA at one point in time. (Can be found in recent versions of OleAcc.idl). Since the MSAA bridge used a direct mapping between QAccessible::Role and MSAA roles this lead to that LayeredPane was interpreted to be an IP address edit control, affecting QStackedWidget (and some relatives). This caused some screen readers to be confused when the same accessible interface had children such as push buttons. I also discussed this change with Harald. Task-number: 257958
| | * | Doc: mark QImage/QPixmap alphaChannel and setAlphaChannel as obsolete.Volker Hilsheimer2009-07-212-41/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They are expensive - which is why QImage::setALphaChannel had been obsoleted in Qt 4.5. Reviewed-by: Gunnar
| * | | Make "-graphicssystem openvg" select OpenVG as default graphics systemRhys Weatherley2009-07-221-0/+4
| |/ / | | | | | | | | | Reviewed-by: Lincoln Ramsay
* | | Add QPixmapBlurFilter for non-convolution blur effects.Rhys Weatherley2009-07-233-15/+276
| | | | | | | | | | | | Reviewed-by: trustme
* | | Compile after merge commit 8079a0c5b4ee6550501476410fab457d63c705b6Bjørn Erik Nilsen2009-07-214-28/+24
| | |
* | | Merge commit 'qt/master' into graphicseffectsBjørn Erik Nilsen2009-07-21248-9776/+7934
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicsscene.h src/gui/graphicsview/qgraphicsview.cpp
| * | Doc: fix links between QGraphicsItem and QTouchEventVolker Hilsheimer2009-07-202-7/+7
| | |
| * | Return selectedFilter in QGtkStyle file dialogsLukáš Lalinský2009-07-202-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function setupGtkFileChooser is modified to optionally build a map of GtkFileFilters. File dialog methods then use gtk_file_chooser_get_filename to get the current GtkFileFilter and look it up in the map produced by setupGtkFileChooser. This value is then saved in the selectedFilter pointer. Merge-request: 846 Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
| * | Doc: clarify relevance for QGraphicsItem and add a few \saVolker Hilsheimer2009-07-201-26/+84
| | |
| * | Doc: small improvementsVolker Hilsheimer2009-07-201-1/+1
| | |
| * | Doc: Make QAction::priority/Priority documentation clearerVolker Hilsheimer2009-07-201-9/+9
| | |
| * | Fixed includes in the gestures public headers.Denis Dzyubenko2009-07-202-10/+9
| | | | | | | | | | | | Reviewed-by: trustme
| * | Fixes build for Windows MobileThomas Hartmann2009-07-201-1/+0
| | | | | | | | | | | | Reviewed-by: Joerg
| * | doc: Changed several \reimp to \internalMartin Smith2009-07-204-16/+2
| | | | | | | | | | | | The base function was \internal pr private.
| * | compile against the Windows 7 SDK RCBradley T. Hughes2009-07-201-15/+16
| | |
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtOswald Buddenhagen2009-07-201-4/+208
| |\ \
| | * | On Vista the native file dialog search feature return wrong paths.Prasanth Ullattil2009-07-201-4/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows Vista (& above) allows users to search from file dialogs. If user selects multiple files belonging to different folders from these search results, the GetOpenFileName() will return only one folder name for all the files. To retrieve the correct path for all selected files, we have to use Common Item Dialog interfaces. Task-number: 258087 Reviewed-by: Jens Bache-Wiig
| * | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-208-33/+67
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| | * Fix the hand scrolling in QGraphicsView that will stop unexpectedly.Alexis Menard2009-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you start a hand scrolling and during moving, you press another button of the mouse than the left one, the scrolling suddently stop working. In mouseReleaseEvent we just stop the hand scrolling if the button is left. Task:258356 Reviewed-by:janarve
| | * Fix crash when native socket notifiers would send a notification after being ↵Norwegian Rock Cat2009-07-201-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled. Spend a lot of time looking at this and at the CoreFoundation source code and it seems that we really do get a notification even after the notifier is disabled. I suspect there's a race condition between when we disable the socket notifier, but the kernel flags it as needing a read, then CoreFoundation just sends the notification without checking if the CFSocket has been disabled. No further notifications come of course. Since this breaks the invariant that was set in the assert, I'm replacing it with an if check. Task-number: 258198 Reviewed-by: Bradley T. Hughes
| | * Fix deadlock in the QWS server when destroying lots of windowsTom Cooksey2009-07-172-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, don't call QWSWindowSurface::winId() in the destructor, as it will actually request a new id if there isn't already one around - which is a bit silly and highlighted the "real" bug. Second, make sure QWSDisplay::Data::takeId() asks for 1 new id before waiting for more ids to arrive. This is because waitForCreation() calls QWSServer::processEventQueue(). If the events in the queue cause takeId() to be called, QWSDisplay::Data::takeId() gets called recursively. Even though there will be a create 15 ids command in the queue, that will only allow 15 QWSDisplay::Data::takeId() calls to return. The 16th call to QWSDisplay::Data::takeId() on the stack will not be able to return because all the IDs have been taken and (because it has been called recursively) no new create id commands have been generated. So the 16th call to takeId() spins in waitForCreate(). Reviewed-by: Paul
| | * Fix accidental selection of popup items under the mouse in QComboBoxmae2009-07-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the widget under mouse is hidden, Qt can generate a synthetic mouse move event which gets delivered to the already hidden widget. This can then result in the wrong item being selected. Workaround: in QListView, ignore mouse move events when the widget is hidden. Reviewed-by: Denis