summaryrefslogtreecommitdiffstats
path: root/src/widgets
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Qt 6: Change QMainWindow::toolBarArea to take const pointer insteadJoni Poikelin2018-10-156-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | toolBarArea took non-const even though const would have been enough. In the public API do this for Qt 6. Fixes: QTBUG-45953 Change-Id: Ic99f4dd5a7f344d49d046e3b084b68120f8de3c0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | QTreeView: small optimization in verticalOffset()Christian Ehrlicher2018-10-131-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the scroll mode is ScrollPerItem and uniformRowHeights is not set, the offset has to be calculated by iterating over all items. Optimize the loop by calculating the last item before the loop instead of checking at every iteration. Task-number: QTBUG-61763 Change-Id: I1d4439fe0fc3f32194f5f368c0486e793048d965 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
* | | QWidget: set brushOrigin in paintBackground() only when really neededChristian Ehrlicher2018-10-132-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When painting the background for a QAbstractScrollArea, the brushOrigin was calculated for every brush type although it was not needed. Since this can be very time consuming (e.g for a QTreeView with non-uniform row sizes) it should be avoided when possible. Therefore check if the brush is a texture and skip the calculation if it is not the case. Also do not restore the old brushOrigin since the painter is not used at all afterwards. Task-number: QTBUG-61763 Change-Id: I66cbe1b796cb5cad4c78e656fb86d199d8e4bde9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | QWidgetTextControl: Get rid of dependency on QTextEditPrivateAlexander Volkov2018-10-092-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | QWidgetTextControl is a base class for controls of text widgets and widget-specific code should be used in derived classes, so override loadResource() in QTextEditControl. Change-Id: I6d829ead0837419530094d19e0ca53a964413e92 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Fix drawing of QGroupBox's title when check box is higher than textAlexander Volkov2018-10-091-11/+16
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-70623 Change-Id: I36c3b3e0250a4d2b0a2a2f03793f0eae3d868de2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | QSideBar: take the icon size from a styleAlexander Volkov2018-10-092-3/+11
| | | | | | | | | | | | | | | Change-Id: I9c4677b42cc920b7bb016b61b8c1fd34fe67aa30 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Deprecate QFont::lastResortFamily() and QFont::lastResortFont()Eskil Abrahamsen Blomfeldt2018-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions have not been used by the font selection algorithm in Qt 5. Calling lastResortFamily() always gave you "helvetica" and lastResortFont() would actually crash. Since we cannot remove them before Qt 6, we deprecate them for now and update the documentation to give a more accurate description of how the font matching works in Qt 5. Note that in the non-native QFontDialog, it tries to implement its own font matching algorithm and therefore was calling lastResortFamily(). Since fixing QFontDialog is not within the scope of this patch, I have just replaced the call by "helvetica" directly, so that it will continue to behave the same. [ChangeLog][QtGui][Text] Deprecated QFont::lastResortFamily() and QFont::lastResortFont() which are not in use in Qt 5 and did not provide any useful information. Task-number: QTBUG-60813 Change-Id: Id8fe7bfdd427292ef86bc8405de03cb466b9b62a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-091-1/+1
|\| | | | | | | | | | | Change-Id: I5cbfd39cf728036bbdfdeec8e8739568e0a3025b
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-081-1/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qtimezoneprivate.cpp Change-Id: Icbb5999d378711ce3786a4fe0aba176a45ac702c
| | * Use update() instead of repaint() when displaying a new messageAndy Shaw2018-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is no advantage to using repaint() here, so using update will give a performance improvement. Change-Id: Icc6a28dfc12dffb8ea3df0300fd14c66c775bf16 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Move cursor selection to start when there isn't any previous line in ↵Michal Lazo2018-10-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection mode Adding standard behavior for text selection, when user want to select text and there isn't any previous line then selection will end on start [ChangeLog][QtWidgets][QWidgetTextControlPrivate] Move cursor selection to start Task-number: QTBUG-69735 Change-Id: If222d37747772f60774f671ffdd273d63cdaf571 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Implement QRegularExpression overload for QPlainTextEdit::findSamuel Gaist2018-10-082-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the missing overload for QRegularExpression to match the QRegExp one for QPlainTextEdit. [ChangeLog][QtWidgets][QPlainTextEdit] Added QRegularExpression find() method overload. Change-Id: Id156971d3fa0372712bfa8b72a55550942a767e0 Reviewed-by: Luca Beldi <v.ronin@yahoo.it> Reviewed-by: David Faure <david.faure@kdab.com>
* | | Implement QRegularExpression overload for QTextEdit::findSamuel Gaist2018-10-084-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the missing overload for QRegularExpression to match the QRegExp one for QTextEdit. [ChangeLog][QtWidgets][QTextEdit] Added QRegularExpression find() method overload. Change-Id: Ic7be224dcc59fc8d832daddd1999a713b7f04253 Reviewed-by: Luca Beldi <v.ronin@yahoo.it> Reviewed-by: David Faure <david.faure@kdab.com>
* | | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-10-0827-84/+138
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/styles/qstylesheetstyle.cpp Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad
| * | QLineEdit: take the size of actions' icons from a styleAlexander Volkov2018-10-062-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The height of a line edit depends on the height of its font, which in turn depends on DPI. So use the DPI-scaled icon size from a style instead of hard-coded values. Task-number: QTBUG-65627 Change-Id: Ic1f5af61b0d6346cfbc828817c4a3a39296a41ba Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * | QtWidgets: Fix Qt application coming to the foreground when launching app by ↵Friedemann Kleint2018-10-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | popup menu Check on the application state before requesting activation. Fixes: QTBUG-70810 Change-Id: I550137dc00209b17f4b3c033287ceef1b871ff50 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | QTreeView: adjust documentation of key bindingsChristian Ehrlicher2018-10-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for key bindings was a little bit unclear for key asterisk. Also sync the names of the left and right key was not consistent (Left/RightArrow - Left/Right) Change-Id: Icee0821880fcc3ebc2ade939cf80127ebf0976ad Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Luca Beldi <v.ronin@yahoo.it> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | StyleSheetStyle: Load @Nx imagesMorten Johan Sørvig2018-10-042-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform a @Nx image file lookup when loading pixmaps. Make drawBackgroundImage() handle high-dpi pixmaps, here the layout calculations needs to be in device- independent pixels Fixes: QTBUG-36825 Change-Id: I61e6f53c59f61f3bd88c34a036349e51e8c8ad92 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | QGraphicsScene: Make focusing on touchBegin optionalUlf Hermann2018-10-043-27/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually we focus in when we receive a click or equivalent. QGraphicsScene by default also transfers the focus when you start a touch on a trackpad or similar. Most of the time this also generates a synthetic mouse click, so people don't necessary notice. However, at least on macOS you can configure this behavior. With focusOnTouch switched off, QGraphicsScene behaves as one would expect on macOS. Fixes: QTBUG-59442 Change-Id: Ib87112640eef6b77892ad2490d80eedd055e6dce Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | QAccessibleTable(Header)Cell: fix isValid()Christian Ehrlicher2018-10-031-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAccessibleTable(Header)Cell::isValid() did not check if the view is still valid as it is done in QAccessibleTable::isValid() which can lead to a crash during destruction when e.g. operator<<(QAccessibleInterface) is called. Change-Id: I930bf4c22aa0aa6868f58a8e5d0dd1557f6b17af Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | Restore styling of QDockWidget title fontAllan Sandfeld Jensen2018-10-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not override a custom font with the style default. Task-number: QTBUG-70276 Change-Id: I58bf43f791aee5409e29459d579725365703e4f3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * | Prevent instantiation of QGestureManager in ~QWidget, ~QGraphicsItem()Friedemann Kleint2018-10-035-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debugging PYSIDE-815 revealed that QGestureManager is instantiated in the application destruction sequence. To prevent that, add a "force" parameter defaulting to true to QGestureManager::instance() and pass false in the destructors and QGestureManager::gesturePending(). Change-Id: I1b76173c926c2a156252b88832b032508d8e8a73 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * | Make overloaded function appear in assistant indexJarek Kobus2018-10-0114-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are overloaded function for one class, at least one of them mustn't possess \overload command, otherwise it won't appear at all in doc index. Task-number: QTBUG-59506 Change-Id: I650a3969cb45c1a5efdfc3a654e01d113c398f16 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | QAbstractScrollArea: fix sizeHint when widget is not visibleChristian Ehrlicher2018-10-043-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTable/QTreeView did not follow the documentation and returned their needed size with scrollbars within viewportSizeHint(). Then sizeHint() also took the size of the scrollbars into account when the policy was set to ScrollBarAlwaysOn. This lead to different results when the widget was shown/hidden and/or the scrollbar was visible or not. Fix it by only adding the additional size when the scrollbars are really visible. Also use header->isHidden() instead of isVisible() in QTreeView the same way it is done in QTableView. [ChangeLog][QtWidgets][QAbstractScrollArea] QTableView/QTreeView are now reporting their viewportSizeHint() correctly taking into account its scroll bars visibility and visibilityPolicy. Task-number: QTBUG-69120 Change-Id: If50959a9f7429275e3e33122644c978fb64972ba Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | QStyleSheetStyle: use specified font property from css for QMenuChristian Ehrlicher2018-10-031-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A font property specified in the css was used while drawing the QMenu action text but not within sizeFromContents() which results in a wrong size of the menu rect used for drawing. Fix it by mimic the rect calculation from QMenuPrivate::updateActionRects(). Fixes: QTBUG-70648 Change-Id: I5cf4f8b679c69197437393965c0bc6326f1c6c3a Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Minor performance improvement to QLabel with ImageLuca Beldi2018-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPixmap::fromImage in QLabel paintEvent should use the rvalue reference overload for efficiency [ChangeLog][QtWidgets][QLabel] Minor performance improvement when painting a label with an image Change-Id: I8ab9bf427c1efc320907c66538e9f8e4011f5586 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Allow to prevent blocking of native dialogs by a proxy Qt dialogAlexander Volkov2018-10-021-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When native dialogs become visible, their invisible proxy Qt dialog blocks input to Qt windows. It is intended for native dialogs which can't block Qt windows themselves, e.g. on Android. But this behavior is incompatible with native dialogs which are implemented as in-process Qt windows, because the proxy dialog blocks them as well. This change introduces QPlatformDialogHelper::DialogIsQtWindow style which allows to detect such cases and prevent blocking. Change-Id: I8f1f741e05d09f2c27192890bcec35fdd2e8f074 Task-number: QTBUG-58116 Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net> Reviewed-by: David Faure <david.faure@kdab.com>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-015-34/+41
|\| | | | | | | | | | | Change-Id: Ic8cdb1c2b7c0a786b1313b6c3a3bf7e9ec288712
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-303-31/+33
| |\| | | | | | | | | | Change-Id: Iaa438d14357be1bf75bb645cb8d3245947c055b8
| | * Modernize the "filesystemwatcher" featureLiang Qi2018-09-273-31/+33
| | | | | | | | | | | | | | | | | | Change-Id: If030b56ad97e047d89d442629262b4839df306d4 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | QDockWidget: Fix icons being too large when using a style proxying Windows styleFriedemann Kleint2018-09-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the check for Windows style to QProxyStyle. Amends 43b9c9b9937c5aaeec611bd32a50a15e81573550. Task-number: QTBUG-38776 Change-Id: I5331d0c29bea59c59309feeab153437a72e0e30f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * | Doc: fix minor issues in QMessageBox docsShawn Rutledge2018-09-291-3/+3
| | | | | | | | | | | | | | | Change-Id: I58a41b3d66bc1fd8af0136f2ef616f717f4a1173 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-2911-18/+38
|\| | | | | | | | | | | Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
| * | Doc: Remove expired link and add see also entry for style sheetsPaul Wicking2018-09-281-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove link to qt.nokia.com and add see also link to Qt Style Sheets that contain the necessary information. Change-Id: I05f6f760f3f9735f99385bdb39507b0878ec220c Fixes: QTBUG-70805 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | Fix disabled IME when QPlainTextEdit read only property is toggledJussi Witick2018-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirror the behavior of working QTextEdit in QPlainTextEdit. The WA_InputMethodEnabled flag was overridden by the following call to setTextInteractionFlags(). Task-number: QTBUG-55699 Change-Id: I46402f5d94204acd304d56f488bb0fb342d1a846 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | QGraphicsScene::update(): Keep the list of updatedRects() uniqueFriedemann Kleint2018-09-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, the rects will pile up when the item is not part of a view. Task-number: QTBUG-54275 Change-Id: I29c989e25ce0ca1ac0b87d0388a476ef1acd9cfd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Do not fall back after resizing a dockMaurice Kalinowski2018-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to 60be2fb6a13315f074c3c0b7793c38632f291e8b. Above change only covers resizes via QMainWindowLayout::hover. Doing a resize via the separator was not covered. Task-number: QTBUG-70571 Change-Id: Ic1d1cc6d672b97e8c130864f8708268fd6003204 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | wasm: enable filesystemmodel for nothreadLorn Potter2018-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-70005 Change-Id: I10b09c1681716b4610147b57db14bce7b0f91b47 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into ↵Liang Qi2018-09-274-6/+10
| |\ \ | | | | | | | | | | | | refs/staging/5.12
| | * | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-274-6/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qconfig-bootstrapped.h src/widgets/util/qcompleter.cpp Change-Id: I4f44f0f074982530f2f2e750ce696230b2754cf3
| | | * Fix QCompleter popups preventing the application from exitingAlexandru Croitor2018-09-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to an implementation detail regarding setParent() and setWindowFlags(), if a QCompleter popup ends up being the last open window after closing the main window, the application would be prevented from exiting even after selecting an item in the popup. This is due to adjustQuitOnCloseAttribute() not being called when passing a Qt::Popup flag to setParent(parent, windowFlags). Use setWindowFlags() directly, which adjusts the quit on close attribute, and allows an application to exit properly. Change-Id: Ic4cff9504df268556d851e40d5ae08b7ed4dc3bf Fixes: QTBUG-69924 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | | * QHeaderView: Don't unhide hidden sections on layoutChanged()Christian Ehrlicher2018-09-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When storing the persistent indexes within _q_sectionsAboutToBeChanged() there was a limit one how much persistent indexes should be stored due to performance concerns. This resulted in unhiding hidden rows. The rationale behind this was that storing persistent indexes is slow and that hiding a large amount of rows/columns should be done with a QSortFilterProxyModel. Fix it by removing the limit since it does not really hurt performance. Task-number: QTBUG-70633 Change-Id: I2311213c2b63c67e2210aa7f73f07d28dc0e47be Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
| | | * Modernize the "datestring" featureLiang Qi2018-09-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2236a456fe3758d9054b22e36fe6316f3522d533 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | | Keep tiled subwindow order on resizePaul Olav Tvete2018-09-271-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMdiArea::tileSubWindows() will move the active window to the first position, in order to be consistent with other MDI applications on Windows (according to the original commit message). However, the same function is also used for re-tiling on resize, so we must make sure to not reorder in that case. Fixes: QTBUG-51761 Change-Id: Ibf93a0bf7e663f983b9160364f812c84b5539171 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * | Android: add support for custom buttons in native MessageDialog helperShawn Rutledge2018-09-251-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | New API in QMessageDialogOptions and implementation on Android. Task-number: QTBUG-35545 Change-Id: I59567251199f220862d01ba76979266379eecd86 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | QPlainTextEdit: add current state of modifiers to auto scroll eventDavid Schulz2018-09-271-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-64856 Change-Id: I8de851e75204bbeb7f3fbd40a5f2200028cc9337 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | QPlainTextEdit: update scrollbars after setting center on scrollDavid Schulz2018-09-261-0/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-64730 Change-Id: I6ff7b10eb209a407c99529a09226cd97f9b6e9f8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.12' into dev" into ↵Liang Qi2018-09-252-0/+2
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-252-0/+2
| |\| | | | | | | | | | | | | | Change-Id: I4d123c3cdf86524716ba67091e0347309b49c837
| | * | Ensure that QTabletEvent is not pre-accepted before sendingShawn Rutledge2018-09-252-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QWidget-world it's normal for input events to have the accepted flag false by default, so that it's obvious after visiting a widget subclass that does not override a particular handler function that it did not handle that event type at all. For tablet events in particular, the contract (to which we've been paying more attention to ensure that QTBUG-47007 remains properly fixed) is that if a QTabletEvent is not accepted, a mouse event will follow. Tablet-unaware applications need to get the same mouse events from a Wacom stylus as they would receive from an actual mouse. In this case the issue was missing hover events (mouse movements in which no mouse button is pressed). Without those, the enterEvent and exitEvent virtuals are also not invoked properly. Task-number: QTBUG-47007 Task-number: QTBUG-65199 Change-Id: I957005aad9d2bf85a3a41bbdebe3e046e34dee4d Reviewed-by: Andy Shaw <andy.shaw@qt.io>