summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-1017-128/+489
| | | | | | | | | 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)
* Fix incorrect rendering of checked menu items on Windows ClassicJonathan Liu2011-05-102-10/+7
| | | | | | | | | | | | | | | | | | | | | | Modify rendering of checked menu items when using Windows Classic style to be more native looking. Changes: * Checked menu items with no icon are not drawn sunken * Disabled checked menu items with an icon have a plain background instead of a checkerboard pattern same as when enabled * Check mark is drawn with highlighted text color when selected to match text * Fix check mark offset for disabled unselected checked menu item as the entire check mark was drawn shifted (1, 1) * Fix color of check mark shadow for disabled unselected checked menu item as it was same color as the check mark when it should be a light color Task-number: QTBUG-15098 Merge-request: 2513 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com> (cherry picked from commit e89a2b72050dd782da16ff24bc2eb84dc36ed6a5)
* Fix OpenGL build break on SymbianGuoqing Zhang2011-05-101-1/+1
| | | | | | Task-number: QT-4871 Reviewed-by: Dmitry Trofimov (cherry picked from commit f3092b91a7a2e9e34dfe7eefb3c6b0ed8c3c3786)
* Fix a bug with menu overflowing from a lower resolution second screen.Pierre Rossi2011-05-102-14/+51
| | | | | | | | | | The menu needs to take into account the screen geometry of the screen it's about to be shown on (not the last screen it was shown on) when updating its actions rects Task-number: QTBUG-2748 Reviewed-by: Thierry (cherry picked from commit b10265efba544b1e4820f45b86354d442f6abf26)
* Calculate the submenu position after emitting aboutToShow()Pierre Rossi2011-05-101-21/+21
| | | | | | | | | The rationale behind this is that if the submenu gets populated in a slot connected to aboutToShow(), we'll have to do it again anyway. Task-number: QTBUG-14739 Reviewed-by: Thierry (cherry picked from commit 0848b860b9251e76b9319f65554f932ab68e33cc)
* Fixed a crash in QListViewThierry Bastian2011-05-101-1/+1
| | | | | | | | | The problem was that QAbstractScrollArea calls layoutChildren on resize but the QListView requires that updateGeometries is called before. Task: QTBUG-18558 Reviewed-By: Pierre (cherry picked from commit 5b3872b2d7523d44ba454a76613e7a3fa45387f7)
* Doc: Fixed reference to a name in a table.David Boddie2011-05-101-1/+1
| | | | | Task-number: QTBUG-18679 (cherry picked from commit a769192ef0393afa07c08a1672b45604fdf64be1)
* Fix progressbar animation on VistaJens Bache-Wiig2011-05-101-5/+4
| | | | | | | | | | | | This fixes two issues. - The indeterminate animation was sometimes incorrectly disabled when value was 0 - The progress animation was incorrectly stopped when progress bars were disabled Task-number: QTBUG-10957 Reviewed-by: richard (cherry picked from commit 05e46b93ccb2334ec3722cf1205058f778d11458)
* QTabWidget/Win: do not add content margin when documentMode enabledJonathan Liu2011-05-101-2/+8
| | | | | | | | | | | | QTabWidget has 2 pixel bottom and right content margin. This removes the margin to maximize the area available for content and improve consistency with other Qt styles when documentMode is enabled. Task-number: QTBUG-15769 Merge-request: 957 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com> (cherry picked from commit 23dd5cb45547de167f5c2e78554e9c3013e59998)
* QTableView: prevent QTableView from hanging when removing rows.Pierre Rossi2011-05-102-1/+21
| | | | | | | | | | | | The problem was introduced in cd2afafb where we removed some code that was meant to adjust the header's offset upon row removal. The problem with this is that visualIndexAt() is likely to return -1 in QHeaderView::paintEvent, which in turn will lead to calling paintSection for each and every section. Task-number: QTBUG-18551 Reviewed-by: Thierry (cherry picked from commit d814e378987348ce2123d083b01ea6fb6c3e6bbf)
* QFileSystemModel: Handle QDir::NoDot and QDir::NoDotDot for setFilterJonathan Liu2011-05-101-5/+7
| | | | | | | | | Add support for QDir::NoDot and QDir::NoDotDot for setFilter in QFileSystemModel. Task-number: QTBUG-14760 Reviewed-by: Frederik (cherry picked from commit b60d82fd56897b1a1d3cc730172f71c27a497ede)
* Don't crash when requesting text.Frederik Gladhorn2011-05-101-1/+5
| | | | | | | | Sometimes during initialization the QAccessibleItemRow will still be in an invalid state. Reviewed-by: Jan-Arve (cherry picked from commit 90b4cf4b1aa0f70a62118e200e76dc1dc57985cc)
* Let QAccessibleButton::text return something even when not visible.Frederik Gladhorn2011-05-101-3/+0
| | | | | | Buttons would not report their text when hidden, which is inconsistent. Reviewed-by: Jan-Arve (cherry picked from commit 1897ca20a343121422b354a7910814ddd37abd17)
* Fixed regression where AT client did not always announce stuff properly.Jan-Arve Sæther2011-05-101-1/+6
| | | | | | | | | | | | | | This fixes a regression that was created by 75e478abdf336bbdc1b00e2ca4f5293d5455a0cb. That broke accessibility on 64 bit windows, since lParam can both be 0x00000000fffffffc and 0xfffffffffffffffc. However, MSDN explicitly says that lParam should be casted to a DWORD, which would result in (an unsigned) 0xfffffffc in both cases. This can then be compared to OBJID_CLIENT (defined to ((LONG)0xFFFFFFFC). Reviewed-by: Prasanth Ullattil (cherry picked from commit 504941bc50234c225f162192491815bc4d6c38cf)
* Don't use inactive borders for spinbox on MacJens Bache-Wiig2011-05-101-1/+1
| | | | | | | | | | This was probably caused by the fact that the only spinbox visible in the main control panel has an inactive frame border. In XCode 4, however the spin buttons are generally attached to an active lineedit frame, so we change the default for 4.8. Reviewed-by: gabriel (cherry picked from commit 6c9d808c5726893e9aa673ca8b0cbebae67f641c)
* Cocoa: respect QT_NO_EXCEPTION in color dialogRichard Moe Gustavsen2011-05-101-0/+5
| | | | | | | | If the macro is set, we should not use cocoa exceptions either, as this causes compile failures Rev-By: jbache (cherry picked from commit cdb5729d8e1ffc4a00b52d6d4bbee34a9820a193)
* Make navigation in TabWidgets consistent.Frederik Gladhorn2011-05-101-4/+9
| | | | | | | | navigate would not return the right index in the parent if the current widget was not the visible one. Reviewed-by: Jan-Arve (cherry picked from commit fdeeaa9d61efea9cca783a1d4098ae505df24390)
* Fix text for checkable buttons, unit tests.Frederik Gladhorn2011-05-101-0/+17
| | | | | | | | Return Check/Uncheck for checkable buttons. Partially revive the buttons unit test. Reviewed-by: Jan-Arve (cherry picked from commit 6040eeebfb1ab3be3906295c373033cd5b5d9dc3)
* Window and Application fixes for accessibility.Frederik Gladhorn2011-05-102-4/+2
| | | | | | | | Return app name instead of window title for root accessibility object. Return Window as accessible type for the main window. Reviewed-by: Jan-Arve (cherry picked from commit 9a5b0d7a579572cd7e7faf869ab1a6684800f592)
* Call QAccessible::updateAccessibility when changing accessible name.Frederik Gladhorn2011-05-101-0/+2
| | | | | Reviewed-by: Jan-Arve (cherry picked from commit e783275cfb71e7325472b3aea54e109a7a854bf7)
* QAccessibleTextEdit: Using x coordinate for calculate character widthJosé Millán Soto2011-05-101-1/+1
| | | | | | | Merge-request: 1148 Task-number: QTBUG-18233 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> (cherry picked from commit 6cd51aeec11e7a70ba560c350274d5a4bd43c9b9)
* Use the virtual API to clear a selection.Stephen Kelly2011-05-101-5/+2
| | | | | | Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> Merge-request: 980 (cherry picked from commit e3cd651d92a9e550fe52360d1be6ae41d0f2ab85)
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1012-134/+135
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Rename QGlyphs -> QGlyphRun
| * Rename QGlyphs -> QGlyphRunEskil Abrahamsen Blomfeldt2011-05-1012-134/+135
| | | | | | | | | | | | | | | | | | | | | | API clean-up for QGlyphRun: 1. QGlyphs -> QGlyphRun 2. QGlyphRun's font()/setFont() -> rawFont()/setRawFont() 3. QPainter::drawGlyphs() -> drawGlyphRun() 4. QTextLayout and QTextFragment's glyphs() -> glyphRuns() Reviewed-by: Jiang Jiang (cherry picked from commit 84ef364302728b68d2d29ea9c4ccbec32c7bb115)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-101-2/+3
|\ \ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Respect capacity in QVector::append().
| * | Respect capacity in QVector::append().Liang Qi2011-05-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in QVector::append(), it should use the capacity for new size, when it is implicit shared and capacity is bigger than the new size. Autotest included. Task-number: QTBUG-11763 Reviewed-by: joao Reviewed-by: Olivier Goffart
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-105-8/+43
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Add internal documentation for QUnifiedToolbarSurface. Fix the autotest condition. Change the repaint() call to an update(). Fix the update() autotest for raster. Change the repaint() to an update(). Set the default graphics system to raster. Revert "Switch the default graphics system to raster on Mac." Fix an race condition in the auto test. Fix an race condition in the auto test. Fix a race condition when the main window is being destructed. Switch the default graphics system to raster on Mac.
| * | Add internal documentation for QUnifiedToolbarSurface.Fabien Freling2011-05-101-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | This document is aimed for developers. This is why it is directly written in the header file. This is not part of the public API. Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 891b6ac7236d21b69bdb54b00051422cee004059)
| * | Change the repaint() call to an update().Fabien Freling2011-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In show_sys(), if we directly call repaint() this will triggers too many UpdateRequest events. This fixes the qwidget autotest "compatibilityChildInsertedEvents". Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 747962e6ec20a59b7e2ed67c5cd685258f199a86)
| * | Change the repaint() to an update().Fabien Freling2011-05-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Forcing to repaint might cause a recursive repaint. Since there is no apparent reason to directly repaint, we just call update(). Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 244fedd484b022881b906b1bc794d5af19d02843)
| * | Set the default graphics system to raster.Fabien Freling2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | This change is specific to Mac OS X/Cocoa. Reviewed-by: Lars Knoll (cherry picked from commit 2c2026df66f237b7313397dd74f6bc3212b94596)
| * | Revert "Switch the default graphics system to raster on Mac."Fabien Freling2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a5d40fd3814ab7c8e865912c03a918bfd5994998. We have to fix the regressions due to the raster engine before putting it by default. (cherry picked from commit 3197fe2af911673c6291db0102e90a0d7f6ae926)
| * | Fix a race condition when the main window is being destructed.Fabien Freling2011-05-102-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the destructor of QWidget, we delete the layout. If the layout is not set to 0 afterwards, a check on the layout might turn true, but any access will end with a segfault. Reviewed-by: João Abecasis (cherry picked from commit abc5a632942c23496d75c49b3b0b4a674cdafdf8)
| * | Switch the default graphics system to raster on Mac.Fabien Freling2011-05-101-1/+1
| | | | | | | | | | | | | | | Reviewed-by: Lars Knoll (cherry picked from commit a5d40fd3814ab7c8e865912c03a918bfd5994998)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-106-11/+9
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove const from QPlatformClipboard::mimeData().
| * | Remove const from QPlatformClipboard::mimeData().Laszlo Agocs2011-05-106-11/+9
| | | | | | | | | | | | | | | Most implementations will anyway do non-const operations in there, the change avoids the need for const_cast or mutable.
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-102-23/+69
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Retrieve the actual data in the Wayland clipboard only when requested.
| * | Retrieve the actual data in the Wayland clipboard only when requested.Laszlo Agocs2011-05-102-23/+69
| | |
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-102-4/+7
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fix QDefaultAnimationDriver