summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* move files in src/gui into their final locationsLars Knoll2011-05-1182-101/+100
| | | | | Rename the guikernel subdir to kernel and guiutil to util.
* Compile fixes after merge.Samuel Rødal2011-05-111-2/+2
|
* Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-1131-470/+946
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qdrawhelper_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qpainter.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg.cpp src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vgegl.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/widgets/graphicsview/qgraphicsscene.cpp
| * Merge remote-tracking branch 'staging/master'Olivier Goffart2011-05-105-22/+262
| |\
| | * Compile on MacEskil Abrahamsen Blomfeldt2011-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | Missing API update in Q_WS_MAC block Reviewed-by: Jiang Jiang (cherry picked from commit 4b95d9939db75d7bd55db4bbbf2d67af459f7eb5)
| | * Avoided calling updateAccessibility() from updateMicroFocus if the item was ↵Jan-Arve Sæther2011-05-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hidden This had the following negative effect in qmlviewer: - Every time the qmlviewer logged something to its QPlainTextEdit (regardless of if it was visible or not) it would call updateMicroFocus (because appending to QPlainTextEdit would move the cursor). The result was that the AT client got overloaded with accessibility state changes, and response time got really bad. (cherry picked from commit ad50e45311cce712fbe35641cde973d616ff560d) Reviewed-by: Frederik Gladhorn (cherry picked from commit a825b3a9e6132842090e43fae85d2c6c61b2def6)
| | * Notify a11y framework of FocusChanges for QGraphicsObjectJan-Arve Sæther2011-05-101-0/+12
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1b5cb7865eb8b48a2721f9b9c3ccd2fb25f8175d) Reviewed-by: Frederik Gladhorn (cherry picked from commit 9a02ad74693f1835745ec20798b353f7e62bcd5e)
| | * Call updateAccessibility on the QGraphicsObject in updateMicroFocusJan-Arve Sæther2011-05-101-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since QGraphicsObjects now can be in the a11y hierarchy, we should treat them just like we treat widgets. (cherry picked from commit 860745a4713b29857d14571572504da71a2ca077) Reviewed-by: Frederik Gladhorn (cherry picked from commit 4687938fd03ed65306039af6b4e5e192ec8bf491)
| | * Fix updateAccessibility for QGraphicsObjectsJan-Arve Sæther2011-05-101-1/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | If updateAccessibility is called on a QGraphicsObject, walk up and find the closest ancestor widget with a HWND. (cherry picked from commit d4291591dfb6a7b1f5c7d00879e8162e84d9ab1b) Reviewed-by: Frederik Gladhorn (cherry picked from commit 96406a7dd609e75340f7b4a05726c60c197786b8)
| | * Make accessibility work on Windows with alienJan-Arve Sæther2011-05-101-13/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that there will be no implicit conversion to windows handles anymore! Enabler for making QML accessible on windows. (cherry picked from commit a3ac7deb5dfe48c5fdd0e170c20b6852c3bb41de) Reviewed-by: Frederik Gladhorn (cherry picked from commit d289e54f2d2aa066cb383d8c8249bd7594bdf7b0)
| * | Allow different text for undo actions and items in QUndoViewAlexander Potashev2011-05-103-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the texts used for undo actions and for items in QUndoView can be set separately. This introduces an extended format of text that can be passed to QUndoCommand::setText or QUndoCommand constructor. The action text can now contain two strings separated by a "\n". The first string (that goes before "\n") is then returned by QUndoCommand::text() and used as name of item in QUndoView. The second string (that goes after "\n") is returned by QUndoCommand::actionText() and used when the text properties of the undo and redo actions are updated. If the text passed to QUndoCommand does not contain "\n", everything works as before, and both QUndoCommand::text() and QUndoCommand::actionText() return the same string. Even though action text in English usually does not need different forms for undo actions and QUndoView item, translators can employ this new command text format, for example to adjust the grammatical case used in command text to match the context of "Undo %1"/"Redo %1". Merge-request: 2610 Reviewed-by: ossi (cherry picked from commit 9b784789c75d59b27530bbf1d12676cc44f64f46)
| * | Allow using not only prefixes for undo command textAlexander Potashev2011-05-103-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions QUndo{Group,Stack}::create{Undo,Redo}Action() now use action text templates "Undo %1" and "Redo %1" if no custom prefix was provided. This makes more flexible translations possible. The surrounding text (like "Undo" and "Redo") can now be suffixed to the command name as German and Korean languages require ("%1 rueckgaengig machen" for German). Also, now the default action text (when no command can be undone) can be translated differently from the prefix. For example, it can be translated as "Undo action", not just "Undo". When a non-empty prefix is passed to QUndo*****::create****Action(), those functions work as before, and the features described above become unavailable. Task-number: QTBUG-14442 Merge-request: 1212 Reviewed-by: ossi (cherry picked from commit 213c25ad24e4f3b0a44f82f23d34746cd294f8d6)
| * | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-102-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This case may be triggered in the (admittedly slightly abnormal) case where a user wishes to embed the calendar widget in a layout or, for whatever reason, do something else that will change its ownership. We work around this by detecting when it is deleted and recreating the widget. This will also have a positive side effect if setCalendarWidget() is called with a widget which is then subsequently deleted, returning the default widget instead of a pointer to (now deleted) memory. Reviewed-by: Denis Dzyubenko Merge-request: 2568 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 124ec3200f8453142717fcfe7a4aa0a55164aaa6)
| * | Fix drawing text in item view:Olivier Goffart2011-05-101-0/+21
| | | | | | | | | | | | | | | | | | | | | Put back code that was removed by mistake in e8019cf8feb402303e6d253f5ca58bebfda42679 Task-number: QTBUG-18998 (cherry picked from commit bbbd4b8f3949b58d4fd21854241cb46cbc024a80)
| * | Fixed bug in X11 backend when creating translucent windows.Samuel Rødal2011-05-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | We forgot to send the ParentAboutToChange event, which meant QGLWidget didn't destroy the old EGL surface. This could cause two EGL surfaces to be created for the same QGLWidget, which leads to undefined behaviour on some platforms. (cherry picked from commit 5a834d7141cc7d29d022911ccec16e628d94acf1)
| * | Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bitMatthew Cattell2011-05-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Regression from 4.5 causing performance and size degradation. Task-number: QTBUG-18997 Reviewed-by: Samuel (cherry picked from commit 18122b473ecbd85ba953f70743b1756358bf7c0c)
| * | Reduce open and stat system calls for QSettingsmae2011-05-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch moves the global static QSettings object from QLibrary to QCoreApplication and reduces a few stat and open calls. Without the patch, a large Trolltech.conf was pushed out of the unused settings cache during startup, meaning Trolltech.conf was parsed more than once. Reviewed-by: Liang Qi (cherry picked from commit 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5)
| * | Fixed off-by-one in radial gradient color table index computation.Samuel Rødal2011-05-101-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Clamp to GRADIENT_COLOR_TABLE-1, not GRADIENT_COLOR_TABLE-2. Fixes visible error in gradients.qps Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com> (cherry picked from commit af9d20680c91f587f4791aa68f3a8b03d3a42be0)
| * | Fixes warnings about unused variablesOlivier Goffart2011-05-109-18/+6
| | | | | | | | | | | | | | | Reviewed-by: Samuel (cherry picked from commit 28061caa38d94de85db9aec743d1efba33c1e46f)
| * | Fixes warnings about unused variablesOlivier Goffart2011-05-1011-65/+1
| | | | | | | | | | | | | | | Reviewed-by: jbache (cherry picked from commit e8019cf8feb402303e6d253f5ca58bebfda42679)
| * | Fixes warnings about unused variablesOlivier Goffart2011-05-105-17/+2
| | | | | | | | | | | | | | | Reviewed-by: Samuel (cherry picked from commit ddd253e14318af45e5c56df736028b88257068c4)
| * | Add accessible events as defined by IAccessible2.Frederik Gladhorn2011-05-101-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | Additional events from: http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_accessible_event_i_d_8idl.html Reviewed-by: Morten Sorvig (cherry picked from commit 6bd74d66b418cad30ed5a448e657a7a5097eed4a)
| * | Removed warning from QPixmap::handle().Samuel Rødal2011-05-101-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | With the new fromX11Pixmap function there are valid use-cases where checking the handle() is useful also with the raster graphicssystem. Reviewed-by: Thiago Macieira (cherry picked from commit 1124f41253edd0e03704db72b0e1b6b4b518bd0f)
| * | Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-05-102-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0916a68056154ecb60e4ea2c79726ab2e49b1532 and 6f1384fcbeea993d5be47590c696de60215b7608. This effectively reverts most of MR 694. Reviewed-by: Olivier (cherry picked from commit 06e104b9c305d3db0dd1848e6e633ee3888fd1de)
| * | Fix insert and scroll to bottom casemae2011-05-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using QtextCursor::insert() with a large text followed by setting the vertical scrollbar to its maximum value (scroll to bottom), QPlainTextEdit would not behave properly if a document size change was triggered by the insertion due to line wrapping. This was visible in Qt Creator. Auto test included. Reviewed-by: con (cherry picked from commit 5d144faf3c524ab557b88f69c4b755e20237e846)
| * | Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-05-103-11/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was previously not possible to render text (QPainter::drawText) in a secondary thread on Symbian, it always resulted in some kind of panic. This patch corrects it. For S60 5.0 and earlier the behavior is not changed, threaded text rendering is only supported on Symbian^3 and newer. This also means QFontDatabase::supportsThreadedFontRendering() will return true from now on, but only on Symbian^3 and higher. Task-number: QTBUG-18516 Reviewed-by: mread (cherry picked from commit 0c62e02b80570bf8b92eff7acceb9018df61c89e)
| * | Typos in internal api docs.Frederik Gladhorn2011-05-101-2/+2
| | | | | | | | | | | | (cherry picked from commit 81f79b80337a4ef967fdd2b0773f0523c1ce9261)
| * | Revert "Fixed a crash in QListView"Thierry Bastian2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | This caused regressions in the QListView This reverts commit 5b3872b2d7523d44ba454a76613e7a3fa45387f7. (cherry picked from commit 0edbaca5e7b718bb9bbbeaccc9e322b525b4327e)
| * | Do not modify window size for fullscreen windows in setGeometry_sysMiikka Heikkinen2011-05-101-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimum sizes of widgets can cause windows to expand beyond screen limits in QWidgetPrivate::setGeometry_sys. Normally this is not noticeable as the window size is forced in various places to the clientRect, but there are certain sequences where the size set in setGeometry_sys is the final one, resulting in too large windows. Removed the modification of window size in setGeometry_sys for fullscreen windows for which the correct size is already requested. Task-number: QTBUG-18749 Reviewed-by: Sami Merila (cherry picked from commit da8f333cfe17a53d475208efa36fa369a9ee4638)
| * | Totally kill MR 916Gabriel de Dietrich2011-05-1011-779/+385
| | | | | | | | | | | | | | | | | | | | | ... the hard way. Reviewed-by: Trust me (cherry picked from commit 443d5b17619002cd6bb428198c453271a01accab)
| * | Another attempt at fixing the MSVC2005 build.Samuel Rødal2011-05-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Apparently direct casting is illegal there too, even though they don't have the cast operators. Reviewed-by: Kim (cherry picked from commit 45c60ceac3d5a401543d7d56a44d1f9227464431)
| * | Compile fix in qdrawhelper_sse2.cpp for MSVC 2005.Samuel Rødal2011-05-101-0/+5
| | | | | | | | | | | | (cherry picked from commit 7f921ea08c296e7451a44a1dae15350ae183ea20)
| * | Reverting merge request 916Gabriel de Dietrich2011-05-107-58/+70
| | | | | | | | | | | | | | | | | | | | | Revert "Introduce menubar plugin system" This reverts commits 56c3de426d97ab7c8fb..f7b60fffb673b182e63 (cherry picked from commit c6514537a8568050f5812a2b55fcf47a3ec2fce1)
| * | Reverting merge request 916Gabriel de Dietrich2011-05-102-1/+3
| | | | | | | | | | | | | | | | | | | | | Revert "Build fix on QMenuBar" This reverts commit ea585d567bf0970c57e31846da044295d80774ba. (cherry picked from commit 68542b72f53f52df43063677e24994463872e81b)
| * | Compile fix in qdrawhelper_sse2.cpp.Samuel Rødal2011-05-101-1/+1
| | | | | | | | | | | | (cherry picked from commit 7cc4ffce36c24596630ca83cd6418869d6383670)
| * | Build fix on QMenuBarThierry Bastian2011-05-102-3/+1
| | | | | | | | | | | | | | | | | | Reviewed-By: gabi Merge-Request: 916 (cherry picked from commit ea585d567bf0970c57e31846da044295d80774ba)
| * | Do not call setSizePolicy from ctor, it might call a virtual functionJan-Arve Sæther2011-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | More specifically, it might very well call updateGeometry() Reviewed-by: Frederik Gladhorn (cherry picked from commit febdcef08f22310cbd70ec13b315f70ff8e41e83)
| * | Fix copyright and a few codestyle mistakesThierry Bastian2011-05-103-114/+113
| | | | | | | | | | | | | | | | | | Reviewed-By: Trust-Me Merge-Request: 916 (cherry picked from commit 56c3de426d97ab7c8fbb3f5766e1872d6f2e91e9)
| * | Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterfaceAurélien Gâteau2011-05-105-14/+14
| | | | | | | | | | | | | | | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> (cherry picked from commit 3d188ffae259584c4351c5fa766a49da9b189112)
| * | Make ctor and dtor of QAbstractMenuBarImpl inlineAurélien Gâteau2011-05-103-47/+3
| | | | | | | | | | | | | | | | | | | | | | | | This way the class does not need to be exported Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> (cherry picked from commit a624a4011adca00d7334462c4d33f574c465110a)
| * | QAbstractMenuBarImpl::allowSetVisible => setVisibleAurélien Gâteau2011-05-104-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to alter the behavior of QMenuBar::setVisible(). It seems to be needed for the Mac menubar. Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> (cherry picked from commit bafeffd7b8b2c40761369ba496ee655dff6cf2a5)
| * | Introduce menubar plugin systemAurélien Gâteau2011-05-104-1/+41
| | | | | | | | | | | | | | | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> (cherry picked from commit be0d346052d69693c2780e62401f3c0d4b0d89d4)
| * | Introduce QAbstractMenuBarImplAurélien Gâteau2011-05-107-299/+694
| | | | | | | | | | | | | | | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> (cherry picked from commit 0432a6b79d35ac7db909a81793417107ebfb668f)
| * | Hide Q<Platform>MenuActionAurelien Gateau2011-05-105-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This will help abstracting the platform specific parts of QMenuBarPrivate in a common interface. Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> (cherry picked from commit c664954295c0605c73f7e69deb9f6130c5f5fb05)
| * | Fix warning about initialization orderAurélien Gâteau2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> (cherry picked from commit f7b60fffb673b182e633545bffd1d310337aca50)
| * | Added support for six-parameter radial gradients.Samuel Rødal2011-05-1011-73/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | The extended radial gradients conform to the radial gradient specification in HTML 5 canvas. Task-number: QTBUG-14075 Reviewed-by: Andreas Kling (cherry picked from commit da55c1ea92474e989e5582b02815936bbf584405)
| * | Improved gradient table generation performance for two-stop gradients.Samuel Rødal2011-05-105-72/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | Two stops is a fairly common case so we gain quite a bit by special casing it. Improves performance by 10 % in parcycle benchmark, and by 90 % in a synthetic benchmark. Reviewed-by: Andreas Kling (cherry picked from commit 5b74a70ac630073582be56f8a0539624a1080185)
| * | Optimized radial gradient fetch using SSE 2.Samuel Rødal2011-05-103-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | On an i7 this improves performance by 22 % in parcycle, 107 % in default svgviewer example, and 283 % in a synthetic radial gradient benchmark. Reviewed-by: Andreas Kling (cherry picked from commit 26bd3dccdee8c6a8f1cf9d254a2a6be7d403aa8d)
| * | Improved qt_gradient_clamp for reflect spreads.Samuel Rødal2011-05-101-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | Using GRADIENT_STOPTABLE_SIZE * 2 as the modulo gives more correct behaviour, and also improves performance slightly. Reviewed-by: Benjamin Poulain (cherry picked from commit 44dd7ef86a3970694a4f8fd9516575c0533a336e)
| * | Prepared for SIMD implementation of radial gradients.Samuel Rødal2011-05-102-177/+174
| | | | | | | | | | | | | | | | | | | | | | | | Made the radial gradient fetch func into a template to be able to optimize the inner loop using SIMD instructions. Reviewed-by: Benjamin Poulain (cherry picked from commit f16c261348193b4c03f796db4e1e3a5db09267a2)