summaryrefslogtreecommitdiffstats
path: root/src/widgets
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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>
* | | | QTreeView: sync keyboard search behavior with other itemviewsChristian Ehrlicher2018-09-251-9/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTreeView has a special implementation of keyboardSearch() which is not consistent to the base implementation regarding the selection behavior: - currentSelectionStartIndex is not set which results in a wrong mouse selection behavior afterwards - only the current index is set but not the current selection Sync the behavior by calling setCurrentIndex() directly in QTreeView too. One problem remains with this patch - the key handling is still different between QAbstractItemView and QTreeView for repeating key presses. Task-number: QTBUG-18862 Change-Id: Ife79d146cf16d6ecbf9f86540777dae15aa1ffb0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-251-0/+1
|\| | | | | | | | | | | Change-Id: I65e4457a218f333161e9e72735b62fc821475f45
| * | Fix shortcuts in dock widgets with custom title barMorten Kristensen2018-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWidgetResizeHandler cannot be sure that it will see the MouseReleaseEvent and therefore buttonDown could be set wrong (and is set wrong in QGraphicsViews). When the mouse is up, the widget should not think it is moving or re-sizing the dock widget. A similar fix exists in the code a few lines above. Task-number: QTBUG-70596 Change-Id: I52ce487836bc71da8fd7d71f8a89e21b51406d00 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com> Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | QHeaderView: apply small optimization in recalcSectionStartPos()Christian Ehrlicher2018-09-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loop in recalcSectionStartPos() calls QVector<>::constEnd() after every iteration which is not needed since the vector stays constant. Therefore use the new for loop syntax from c++11 so constEnd() is only called once which gives a small speedup, noticeable with large section counts. Change-Id: If318eec10c9ce234004a9922409fbdbc6409f2f8 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
* | | QItemWidgets: emit layoutChanged with proper sortHintChristian Ehrlicher2018-09-243-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout(AboutToBe)Changed gained a sortHint parameter with Qt5.0 but the itemmodels did not set a proper value where possible. Since the sorting of the ItemWidgets is only per column, it is reasonable to pass QAbstractItemModel::VerticalSortHint in the various layoutChanged calls. Change-Id: Ia11322bae1a96bc0d7d8422558a11cdfe04c2808 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | QListView: Speedup handling of hidden itemsChristian Ehrlicher2018-09-172-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead iterating through all rows to get the number of hidden items, iterate over the hidden items which are fewer items. Also don't create a temporary vector with visible flow positions by remembering the count of hidden items before the working index and adjusting them appropriately which gives a significant performance boost when working with a large data set. [ChangeLog][QtWidgets][QListWidget] Speedup handling of hidden items when working with large data sets Task-number: QTBUG-68977 Change-Id: I599b6e97945c245f02229145baad8363ec2bf2f5 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | QTableView: fix calculating cells to drawChristian Ehrlicher2018-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The width of the bitarray which should avoid redraws of already drawn cells is sometimes calculated with other parameters then the actual drawing. This can lead to cells which are not drawn. The reason for the discrepancy is that for the initial calculation the headers viewport width is taken which can be smaller than the real width due to a css border. Since all other QHeaderView operations do not take the border into account the problem arises. This will not fix the visual glitch (the header separators are not painted at the same position as the grid) but will at least draw all needed cells. Task-number: QTBUG-20316 Change-Id: I4a1e35ee3ea51b1b458ad3497aab0a34af680cb8 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | stylesheets: Don't fail silently with invalid background-imagesSergio Martins2018-09-161-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Print a qWarning, otherwise this is very hard to notice Change-Id: I882f97583071e786d5aa06f6eeb485da4fc646db Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: David Faure <david.faure@kdab.com>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-111-0/+5
|\| | | | | | | | | | | Change-Id: I1df9adea124326ef7c7802839eb93efc4302b287
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-101-0/+5
| |\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/macx.conf Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
| | * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+5
| | |\ | | | | | | | | | | | | Change-Id: I2fa26fa061cbf5d2bded203a299a19b7d1c31d0a
| | | * Make QMacCocoaViewContainer work againMorten Johan Sørvig2018-09-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The widget visibility state was set to explicitly hidden, which was preventing it from working correctly when its parent widget was shown. This regression was introduced by commit d7a9e08, which made QWindow::setVisible() call QWidget::setVisible(). QWindow::destroy() calls QWindow::setVisible(false), which means that the destroy() call in setCocoaView() would set the CoocaViewContainer to be explicitly hidden. Clear WA_WState_Hidden to work around this behavior. Task-number: QTBUG-67504 Change-Id: I77438fcd01f165f058eea178c214838bd4f27084 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-102-5/+10
|\| | | | | | | | | | | | | | | Change-Id: If1baf48f0f396fb223672d14f0e1847ac42ca1a6
| * | | QTableView: Fix PageUp not getting to top when first row is hiddenChristian Ehrlicher2018-09-091-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the first row(s) of a QTableView is hidden, PageUp could not reach the first visible row because logicalRow(0) is taken without checking if the row is visible. Task-number: QTBUG-70215 Change-Id: Ic7820352b8988accb685ea7d16908d3fa8bf2847 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Luca Beldi <v.ronin@yahoo.it> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: David Faure <david.faure@kdab.com>
| * | | QLayout: Better document QLayout(QWidget *parent) behaviorChristian Ehrlicher2018-09-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLayout(QWidget *parent) directly calls parent->setLayout(this) which can lead to a runtime warning later on when someone tries to set the layout on the parent again. Task-number: QTBUG-69761 Change-Id: I21ef8895fd65f3e23e57527a6d38936e45417b63 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-091-0/+2
|\| | | | | | | | | | | | | | | Change-Id: I36cda712b4cf960de70e497aef52fbc491099f1c
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-071-0/+2
| |\| | | | | | | | | | | | | | Change-Id: I66c7f18a2abd13601da0947919436f7da3549ae9
| | * | Doc: Check before including the \snippet from a .pro fileVenugopal Shivashankar2018-08-301-0/+2
| | |/ | | | | | | | | | | | | | | | Change-Id: Icc7552b46a2657c81958e40f33596ddeee045172 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-074-13/+13
|\| | | | | | | | | | | Change-Id: I799e2ca2fefa140c8b73b73aa959c6ed8da6eae6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 17:25:52 +0000