summaryrefslogtreecommitdiffstats
path: root/src/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Fix title bar height of Aero wizard on Windows 8.Friedemann Kleint2013-01-092-4/+17
| | | | | | | | | | | Windows 8 no longer allows for negative values to WM_NCCALCSIZE to shrink the title bar. Task-number: QTBUG-28435 Change-Id: I2e2e5e6aea9cc6781be4e9b06c9547e1e5ec86cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix frame of Aero-Style wizards.Friedemann Kleint2013-01-093-46/+29
| | | | | | | | | | | | | | | | Add custom frames which are added to the system frame to the platform plugin. Make them settable when creating a platform window using dynamic properties and per window properties of the platform native interface. Use this in favor of the native event handling changing the frame in wizard_win.cpp since that caused the frame/backing store sizes of the QWindow to be wrong. Task-number: QTBUG-28099 Change-Id: Idd6416cf1b0eb629f56663088b0ce17162e1739d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-01-094-26/+43
|\ | | | | | | Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
| * Replace macro qdoc with Q_QDOCDebao Zhang2013-01-081-1/+1
| | | | | | | | | | | | | | | | Both qdoc and Q_QDOC are used in source code, which looks not good. Change-Id: I4f3a71670278b0758d92bfa5db086a07e1b1acfd Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * QWindowsVistaStyle: fix frame renderingJ-P Nurmi2013-01-071-22/+26
| | | | | | | | | | | | | | | | | | | | A regression caused by 79a389 - it should only draw a styled frame for text input widgets. Task-number: QTBUG-28876 Change-Id: I5cda920b7db55f35e0ab6cee460c0e27951d29b9 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Add QStyleHelper:isInstanceOf()J-P Nurmi2013-01-072-3/+16
| | | | | | | | | | | | | | Task-number: QTBUG-28876 Change-Id: I343dff1c47c52e0431c09b6097da09f34e626f54 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge branch 'stable' into devFrederik Gladhorn2013-01-073-11/+54
|\| | | | | | | | | | | | | Conflicts: tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47
| * Do not send QAccessible::Focus when current index is changed.Jan Arve Saether2013-01-041-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | This had the unfortunate side-effect that focus was reported to change (but it didn't) just because the qtabbar was shown. Found by clicking the different categories on the left-hand side of the options dialog in Qt Creator. So, what happened was that clicking "Text Editor" would move the accessibility focus (that the AT client saw) to the "Font & Colors" tab) Change-Id: I19a508f6a32a77696079d24c3c6408cb6c3d9fd5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Fix QGuiApplication::keyboardModifiers() and QGuiApplication::mouseButtons()Jon Severinsson2013-01-041-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous commit b2363a935c8dac fixed keyboardModifiers() after QPA event processing, but broke QTestLib, which expects spontaneous input events sent to qApp->notify() to update keyboardModifiers() and mouseButtons(). The commit also did not fix mouseButtons() after QPA event processing, and missed keyboardModifiers() after QPA Tablet event processing. This commit fixes all these shortcommings in b2363a935c8dac. Includes test case by David Faure <faure@kde.org> Task-Number: QTBUG-26887 Change-Id: I8518b06c4ce86ea7b35120e3353a45ea2a81d356 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * QGtkStyle: exclude Xlib calls on MacJ-P Nurmi2013-01-031-1/+10
| | | | | | | | | | | | | | Task-number: QTBUG-28769 Change-Id: I3f83b6011acf43e5136a762d0f8841b3a910cecb Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Merge branch 'stable' into devFrederik Gladhorn2013-01-0464-350/+482
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/painting/shared/shared.pri src/corelib/tools/qharfbuzz_p.h src/corelib/tools/qunicodetools.cpp src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
| * Fix warning found by clang:Thiago Macieira2012-12-311-1/+1
| | | | | | | | | | | | | | | | kernel/qwidgetsfunctions_wince.h:61:34: error: no newline at end of file [-Werror,-Wnewline-eof] Change-Id: Icbc35227946652db53fc8454d1d42043aa7c15b9 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Remove unused function _q_qgraphicsItemSetFlagThiago Macieira2012-12-291-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang reports: graphicsview/qgraphicsitem.cpp:1779:13: error: function '_q_qgraphicsItemSetFlag' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] static void _q_qgraphicsItemSetFlag(QGraphicsItem *item, QGraphicsItem::GraphicsItemFlag flag, ^ According to the public Git history, in Qt 4.5.1 this function was already unused. The only reason it wasn't caught so far is that it is recursive: it calls itself. So it is used... by itself. Change-Id: I6fc6b33cb314b845525dc9315d0ad742e113d5cd Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Fix warnings reported by Clang in QtWidgetThiago Macieira2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | qwizard.cpp:919:24: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] if ((info.wizStyle == QWizard::AeroStyle) ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ Change-Id: I477cc4e331633682b79df3cb0113558e9019280c Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Fixed typo 'collasping' in QTreeView documentationThorbjørn Lindeijer2012-12-281-1/+1
| | | | | | | | | | | | Change-Id: Ib49c3500c4b3a40a7eaf17404cecc2c38de90530 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * Mac: Bring back proper layout in QMessageBoxGabriel de Dietrich2012-12-242-16/+16
| | | | | | | | | | | | | | | | Resolved by s/Q_WS_MAC/Q_OS_MAC where appropriate. Task-number: QTBUG-28738 Change-Id: I8f1239839bffb092387d527af78e9dbe1628ef67 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Bump Qt version to 5.0.1Sergio Ahumada2012-12-211-5/+5
| | | | | | | | | | Change-Id: Ie8f437b8dfe8a67c7b34321439dd988a02612437 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix some typosSergio Ahumada2012-12-212-2/+2
| | | | | | | | | | Change-Id: I4e8d9bd8ea66ec810e4f1fbfd8ddbf25c4b3d980 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Mac: fix transient QScrollBar flashingJ-P Nurmi2012-12-201-1/+1
| | | | | | | | | | | | Task-number: QTBUG-28669 Change-Id: I9825584f15c34709f7897533220911b6bf3ea21d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Style animations: fix QCommonStylePrivate::stopAnimation()J-P Nurmi2012-12-201-1/+3
| | | | | | | | | | | | | | | | | | | | Explicitly delete animations, and remove the check for stopped state as that is already done by QAbstractAnimation::stop() and we want to delete the animation regardless of the current state. Task-number: QTBUG-28506 Change-Id: I3e34316e5077a8627ff5e6d3babd1873bbbaa774 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Mac: Ignore ScrollBarAlwaysOn policy for transient scrollbarsGabriel de Dietrich2012-12-191-11/+14
| | | | | | | | | | Change-Id: I8a542263df64a21cad6b8cddc5ab1d8a93e153d5 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Mac: New rendering for disclose triangle, get proper color when selectedGabriel de Dietrich2012-12-192-16/+27
| | | | | | | | | | Change-Id: I2be0a28df3f5dd2fdfae13be6ec98763a04187c1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Check for gtk_adjustment_configure as this is not always implementedAndy Shaw2012-12-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Some implementations seem to not have the gtk_adjustment_configure function implemented so we check for this so that there is no problem when it tries to use it. Task-number: QTBUG-23569 QTBUG-25760 Change-Id: I777ce09268f86907f3da3cede408c9a41be566cf Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Karim Pinter <karim.pinter@digia.com>
| * Accessibility indexes are no longer 1-based.Frederik Gladhorn2012-12-181-5/+5
| | | | | | | | | | | | | | | | | | | | The updates for focus/selection in QTreeView were still adding +1 as it was required in Qt 4. Task-number: QTBUG-28174 Change-Id: Ib9fea7e20d431a0ef0db18494e7bdda06a0646b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Fix focusproxy-relayed crash in QGraphicsItem destructor.Andreas Aardal Hanssen2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes tst_qgraphicsitem::tst_focusProxyDeletion not crash. valgrind reported the error when running tst_qgraphicsitem. The crash was very real; when deleting an item that has another item as a focus proxy, the proxy still had a reference to the deleted item's focusProxy pointer. I'm not a huge fan of whitebox testing but thought this crash justifies a modification of the test to make it fail, instead of just passing silently with a warning only given by valgrind and friends. FTR the reason the test doesn't crash hard is that the memory is freed but not reused within the scope of the test. So the access to the pointer d_ptr->focusProxy succeeds, it just accesses memory that might as well have been reclaimed. But this is quite undefined... Task-number: QTBUG-28321 Change-Id: I2624631f5e5c2a8aa8bd4efe1fc128eba6c61f56 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Accessibility: Activate in QGuiApp instead of QApp.Frederik Gladhorn2012-12-161-4/+0
| | | | | | | | | | | | | | | | This makes it possible to use accessibility with QQuickWindow. Change-Id: I5fccd5f25021c4953b03e146705f48a198dbaaa7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Call QAccessible::updateAccessibility when caret moves in QTextEditJosé Millán Soto2012-12-163-1/+16
| | | | | | | | | | Change-Id: I3b9e5d8e67b4928558b642a4d23aa60ae9dfde60 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Remove unused private member.Frederik Gladhorn2012-12-141-2/+0
| | | | | | | | | | | | Change-Id: I54f3f748763dd5959552df864af38558c136dc87 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| * add missing include when Q_NO_USING_KEYWORD is definedJing Bai2012-12-141-0/+3
| | | | | | | | | | | | Task-number: QTBUG-28446 Change-Id: I348de023035a15f3c769610abdaf0ebd7273ca34 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix empty window title regression, add application display name to window titleDavid Faure2012-12-141-31/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This increases consistency a lot: all windows and dialogs from a Qt application will show the app display name in the caption, on Windows and X11. This helps identifying which app a dialog belongs to, which is especially useful when the dialog is very generic and shows up unexpectedly. For compatibility reasons, the app name is added to the caption only if setApplicationDisplayName() was called -- or if the caption would be completely empty. The standard Qt4 case (setWindowTitle + no display name) is unchanged. Change-Id: Ib284c62c1f4c0bc923e5bc2d10247d95e9aa76c1 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Fix QGtkPainter::reset() to reset the clip rectJ-P Nurmi2012-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Due to preparation for GTK3 support, QGtkStyle::drawXxx() no longer creates a local instance of QGtkPainter upon every call, but QGtkStylePrivate::gtkPainter() will (in the future) dynamically choose between QGtk[2|3]Painter. The same painter instance is now re-used between the calls, but wasn't properly reseted between. Task-number: QTBUG-28557 Change-Id: I29be318dbb54d97ed23dfb88d406a3a833db4369 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Fix QWidget::setWindowOpacity() when called before show().Friedemann Kleint2012-12-121-2/+1
| | | | | | | | | | | | | | | | | | Pass opacity from the QWidget to QWindow and to the platform windows. Task-number: QTBUG-28477 Change-Id: If5a85d9183bd1ca33dac2052936ecd1e6c0b5f6c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * QMenu: Do not set snapToMouse if a caused-widget exists.Friedemann Kleint2012-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When clicking at the bottom-right corner of a menu in a menu bar, it appears at the wrong position. Add test and stabilize RTL-tests by making sure the layout direction is cleared should they fail. Task-number: QTBUG-28031 Task-number: QTBUG-2596 Change-Id: Ibc5ae916388753908e9f3ee98e8859faaa0c8723 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Mac: disable transient scrollbar animations for non-QScrollBarsJ-P Nurmi2012-12-113-8/+12
| | | | | | | | | | | | | | | | Task-number: QTBUG-28389 Task-number: QTBUG-28380 Change-Id: I91edd9c8aba60118d722bbf9ad5b85f994398823 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * QApplication docs: restore console mode -snippetJ-P Nurmi2012-12-112-14/+25
| | | | | | | | | | Change-Id: I1f8ce949ae660a209a2092a2863d5c25e2908004 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * QScrollBar::initStyleOption(): fix QStyle::State_On handlingJ-P Nurmi2012-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | QWindowsStyle considers QStyle::State_On as pressed, whereas QMacStyle uses the same state for transient scrollbars. Thus, to indicate transient scrollbars, QScrollBar::initStyleOption() must set QStyle::State_On only when the current style actually supports transient scrollbars. Task-number: QTBUG-28523 Change-Id: I94d207b1e8c5c4bd6f4b99e8b4f1661197fbe9dd Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * QGraphicsView - fix rubberband to expand on wheel eventThorbjørn Lund Martsum2012-12-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SHA 51914375b615ddcac711171ac31779fea01b4323 the rubberband selection was fixed, so it followed the scene-point on mousemove. However wheelEvent could move the view - but avoid update of the rubberband (that would not be updated until next mouse-move). This patch fixes that (and generally improves rubberband behavior) since QGraphicsViewPrivate::mouseMoveEventHandler is called by replayLastMouseEvent, which is called from various places, where we need to update the rubberband (e.g scrollContentsBy). Change-Id: I1b78c27edaaecea797a2319086d7a11d437d2bd3 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * QGraphicsView - move rubberband-handling into a private functionThorbjørn Lund Martsum2012-12-112-48/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves the rubberband-handling from QGraphicsView::mouseMoveEvent to QGraphicsViewPrivate::updateRubberBand. This function is then called from QGraphicsView::mouseMoveEvent. I have removed some d-> and added some q-> but beside that nothing is changed in the code. Change-Id: Iab70c55635c43733e0e02bb70e2bb03b90bf62f0 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * Remove QT_DLL and QT_NODLL defines.Stephen Kelly2012-12-111-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-28044 Change-Id: Ib8c4e1e8e52703aa6590875c34f05b6bc71db808 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * QGraphicsView - add const to a not modified local variableThorbjørn Lund Martsum2012-12-111-1/+1
| | | | | | | | | | | | | | | | | | The QPointF ep is not modified. There is no reason it shouldn't be const. Change-Id: I41fb8f9ae5296a7a40f7eb8be13fc14d56915e3f Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * QGraphicsView - remove reference to avoid weird code.Thorbjørn Lund Martsum2012-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | Even though the code before theoretic is ok, we really shouldn't have a reference since mapFromScene returns a QPointF and not a const QPointF&. Change-Id: I5ea8fd238bdbdd21fb1e3b6b5f280d45e3bc43ef Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * Hardcoded url for Mac Os X Aqua QTBUG-28500Nico Vertriest2012-12-111-2/+2
| | | | | | | | | | Change-Id: I83d87d155b7ca502098a53e955fdde3c908e3300 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Hardcoded url Item View Classes QTBUG-28500Nico Vertriest2012-12-111-3/+0
| | | | | | | | | | | | | | Removed link to Item View Classes in Qt4 Change-Id: Ic3c38a33edc88faf072b8fe7e3accfe1ee75ac78 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * QtBase: Doc: Fix Links to designer manual.David Schulz2012-12-101-1/+1
| | | | | | | | | | Change-Id: I87f68fb70aa773c44b90b58bd56fc5585a7e4107 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Compile with QT_NO_CURSOR.Volker Krause2012-12-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Mostly straightforward, the a11y changes might look a bit drastic, but the base class QAccessibleTextWidget was already disabled in this case, so we have to obviously take out its sub-classes as well. Change-Id: I682ace20d6938688ddb1da23c3463f3c025fab8e Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
| * Fix typos and style in QToolBar documentationDavid Gil2012-12-071-15/+15
| | | | | | | | | | Change-Id: Ic4b4e18746382bae1b6dae009e1e5663c7a21a84 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Mac: Missing update when hovering from one scrollbar to anotherGabriel de Dietrich2012-12-061-3/+3
| | | | | | | | | | Change-Id: I9837bb72935cb4e3680e4bd23b5535f654b5fde6 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * Mac: Transient scrollbars should overlap in the corner on 10.8Gabriel de Dietrich2012-12-061-1/+9
| | | | | | | | | | Change-Id: Ied239d5e3cb05bed6b892607f0344e6daa028918 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * Mac: Animated expanding scrollbars on 10.8Gabriel de Dietrich2012-12-062-29/+76
| | | | | | | | | | Change-Id: Ib57d0347a7828ac7582b0fa95adf8d437694cd41 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * Mac: Cleaner transient scrollbar renderingGabriel de Dietrich2012-12-061-14/+7
| | | | | | | | | | | | Change-Id: I617588012aa5166775c3c6301ee70043b22553a3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>