summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bitMatthew Cattell2011-05-021-1/+4
| | | | | | | Regression from 4.5 causing performance and size degradation. Task-number: QTBUG-18997 Reviewed-by: Samuel
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-05-024-6/+9
|\
| * Make pixel size a qreal in QRawFontEskil Abrahamsen Blomfeldt2011-05-022-5/+5
| | | | | | | | | | | | | | | | The pixel size in the font engines is already a floating point value. For maximum flexibility, we should expose this in the public API. Task-number: QTBUG-18817 Reviewed-by: Jiang Jiang
| * Make sure removed QTextBlock is invalidJiang Jiang2011-04-293-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | If the block is removed from document block map, we will mark the right node to the current head->freelist index, but it shouldn't be accessed directly, otherwise it can cause crash because of uninitialized node. Hence we need to check if a node index is equal to current freelist index. If so, it cannot be a valid block. Task-number: QTBUG-18500 Reviewed-by: Eskil
| * Make sure QFont's resolve mask is copied on compilers with C++0x supportEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| | | | | | | | | | | | | | | | The QFont consists of a d pointer and a resolve mask, and they should both be copied in the assignment operator. Task-number: QTBUG-18921 Done-by: Friedemann Kleint
| * Fix glyph position issue with fallback fontsJiang Jiang2011-04-291-0/+3
| | | | | | | | | | Task-number: QTBUG-18933 Reviewed-by: Eskil
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-04-294-2/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Legal: add the license header to the hand-edits Clear the root index when the model is reset. Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver:: Fixed QTBUG-11935
| * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-284-2/+61
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-271-0/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Clear the root index when the model is reset.
| | | * | Clear the root index when the model is reset.Girish Ramakrishnan2011-04-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18839 Change-Id: I46608d7481d820fa74a9be60df1e018e70a761c6 Merge-request: 2598 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-27220-1452/+6401
| | | |\ \
| | * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-271-2/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver:: Fixed QTBUG-11935
| | | * | | | Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver::Emmanuel BOURGERIE2011-04-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tables() returns tables in all databases on the server" This bugfix has been rewritten to match contributors advise. Change-Id: I3a9cf900ff7eae47c9ffdbcf34bcb1b4396d9837 Merge-request: 1010 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| | | * | | | Fixed QTBUG-11935Emmanuel BOURGERIE2011-04-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7bdb0ceecf2892f6be73d1816764a2bab6275f1 Merge-request: 1010 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-272-0/+50
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Legal: add the license header to the hand-edits
| | | * | | | | Legal: add the license header to the hand-editsThiago Macieira2011-04-272-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-293-7/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed off-by-one in radial gradient color table index computation. Support more items for QTextCharFormat::VerticalAlignment enum for custom text objects.
| * \ \ \ \ \ \ \ Merge remote branch 'qt-fire-review/master'aavit2011-04-283-7/+15
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Fixed off-by-one in radial gradient color table index computation.Samuel Rødal2011-04-281-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>
| | * | | | | | | Support more items for QTextCharFormat::VerticalAlignment enum for custom ↵Dmitry Zelenkovsky2011-04-282-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text objects. * QTextCharFormat::AlignNormal - support text format descent, place text object bottom on (baseline - descent). * QTextCharFormat::AlignBottom - place text object bottom on baseline. * QTextCharFormat::AlignTop - Still not supported. * Any other vertical alignment is mapped QTextCharFormat::AlignBottom. Add new enum AlignBaseline for custom inline objects to take into account font baseline. Merge-request: 2578 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-04-2934-124/+935
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: (49 commits) Make QLineControl send accessibility updates. Fix warning (unused variable) in QAccessibility test. Add accessible events as defined by IAccessible2. Return name and allow actions for invisible accessible items. Skip child count test on Intel compiler. Removing the "resetInternalData" slot in QAbstractProxyModel Typos in internal api docs. Fix tst_QTableWidget::task219380_removeLastRow Fix tst_QTableWidget::task219380_removeLastRow Fixed a crash on Windows XP with mingw in threaded-code Totally kill MR 916 Fix licence headers again for MR 900 Reverting merge request 916 Reverting merge request 916 Build fix on QMenuBar Fix licence headers again for MR 900 Fix copyright and a few codestyle mistakes Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterface Make ctor and dtor of QAbstractMenuBarImpl inline QAbstractMenuBarImpl::allowSetVisible => setVisible ...
| * \ \ \ \ \ \ \ \ Merge branch '4.8-upstream'Thierry Bastian2011-04-28142-1113/+7200
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make QLineControl send accessibility updates.Frederik Gladhorn2011-04-277-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it emit the signals for the right object, it needs its parent to be the QGraphicsItem/SGItem/QLineEdit. According to IA2 it should emit TextUpdated and CursorMoved signals. TextChanged is deprecated. More fine grained signals would be desireable but this makes changes work at all. Reviewed-by: Morten Sorvig
| * | | | | | | | | | Add accessible events as defined by IAccessible2.Frederik Gladhorn2011-04-271-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional events from: http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_accessible_event_i_d_8idl.html Reviewed-by: Morten Sorvig
| * | | | | | | | | | Return name and allow actions for invisible accessible items.Frederik Gladhorn2011-04-271-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason not to report the name or allow actions when a widget is invisible. Reviewed-by: Morten Sorvig
| * | | | | | | | | | Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-04-262-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0916a68056154ecb60e4ea2c79726ab2e49b1532 and 6f1384fcbeea993d5be47590c696de60215b7608. This effectively reverts most of MR 694. Reviewed-by: Olivier
| * | | | | | | | | | Typos in internal api docs.Frederik Gladhorn2011-04-221-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master-upstream'Thierry Bastian2011-04-19793-82314/+55243
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed a crash on Windows XP with mingw in threaded-codeThierry Bastian2011-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The thread callback doesn't align the stack on 16-bytes on WinXP. That causes a crash when we call SSE code. So now we tell the compiler to force that alignment of the stack. Task: QTBUG-18631 Reviewed-By: Olivier
| * | | | | | | | | | | Totally kill MR 916Gabriel de Dietrich2011-04-1511-779/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... the hard way. Reviewed-by: Trust me
| * | | | | | | | | | | Fix licence headers again for MR 900Sergio Ahumada2011-04-142-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Gabriel de Dietrich
| * | | | | | | | | | | Reverting merge request 916Gabriel de Dietrich2011-04-147-58/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Introduce menubar plugin system" This reverts commits 56c3de426d97ab7c8fb..f7b60fffb673b182e63
| * | | | | | | | | | | Reverting merge request 916Gabriel de Dietrich2011-04-142-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Build fix on QMenuBar" This reverts commit ea585d567bf0970c57e31846da044295d80774ba.
| * | | | | | | | | | | Build fix on QMenuBarThierry Bastian2011-04-142-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: gabi Merge-Request: 916
| * | | | | | | | | | | Fix licence headers again for MR 900Gabriel de Dietrich2011-04-142-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Trust me
| * | | | | | | | | | | Fix copyright and a few codestyle mistakesThierry Bastian2011-04-143-114/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust-Me Merge-Request: 916
| * | | | | | | | | | | Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterfaceAurélien Gâteau2011-04-145-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
| * | | | | | | | | | | Make ctor and dtor of QAbstractMenuBarImpl inlineAurélien Gâteau2011-04-143-47/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way the class does not need to be exported Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
| * | | | | | | | | | | QAbstractMenuBarImpl::allowSetVisible => setVisibleAurélien Gâteau2011-04-144-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>
| * | | | | | | | | | | Introduce menubar plugin systemAurélien Gâteau2011-04-144-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
| * | | | | | | | | | | Introduce QAbstractMenuBarImplAurélien Gâteau2011-04-147-299/+694
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
| * | | | | | | | | | | Hide Q<Platform>MenuActionAurelien Gateau2011-04-145-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>
| * | | | | | | | | | | Fix warning about initialization orderAurélien Gâteau2011-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
| * | | | | | | | | | | Add the QIdentityProxyModel.Stephen Kelly2011-04-125-1/+701
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older commit history is in KDE svn: http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/itemviews/kidentityproxymodel.cpp?view=log Ammended to update the license headers. Merge-request: 900 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| * | | | | | | | | | | Fix incorrect rendering of checked menu items on Windows ClassicJonathan Liu2011-04-122-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>
| * | | | | | | | | | | Fix a bug with menu overflowing from a lower resolution second screen.Pierre Rossi2011-04-112-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
| * | | | | | | | | | | Calculate the submenu position after emitting aboutToShow()Pierre Rossi2011-04-111-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
| * | | | | | | | | | | Fix progressbar animation on VistaJens Bache-Wiig2011-04-061-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
| * | | | | | | | | | | QTabWidget/Win: do not add content margin when documentMode enabledJonathan Liu2011-04-051-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>
| * | | | | | | | | | | QTableView: prevent QTableView from hanging when removing rows.Pierre Rossi2011-04-042-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
generated by cgit v0.12 at 2025-01-29 19:48:03 (GMT)