summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* FileChooser portal: skip empty filters to avoid rejection from portalsJan Grulich2020-10-121-0/+5
| | | | | | | | | | | Xdg-desktop-portal will reject any OpenFile request if there is an empty filter. We will just simply skip it to avoid the rejection so users get a file dialog. Change-Id: I85c056f46b22cdbc9e14010bc3c49206b6f8f002 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 316bf124437f4aaef10c29db5a158092ca7a832a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid heap-buffer-overflowRobert Loehning2020-10-121-1/+1
| | | | | | | | | | [ChangeLog][QCosmeticStroker] Avoid a heap-buffer-overflow found by oss- fuzz as issue 25243. Change-Id: I36112f183241679e172ad1ee531e1b929d6f3815 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 1d778a59f781ecf822c9e3f7777b680fea2c4e62) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add toInt() and friends to QStringViewLars Knoll2020-10-123-0/+280
| | | | | | | | | | | | | The implementations are not trimmed for efficiency, but as a porting help for Qt 6. Because of that, they simply use the methods available in QString. Task-number: QTBUG-86516 Change-Id: I39ea04a6c96ca43f3a88a9be4e63a5dea4a4e479 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Loosen the API contract for QStringView::left() and friendsLars Knoll2020-10-122-9/+22
| | | | | | | | | | | | | Remove the assertions in QStringView::left() and friends and turn them into runtime bounds checking instead. This changes the behavior to be compatible with what we do in Qt 6 (see change d2833a3ce5af725d66ef9338f2a61b766dd3cb2d) and simplifies porting from QStringRef to QStringView. Task-number: QTBUG-86516 Change-Id: I28e3beb4f42c7b9dfc52813cbcfa322a3df5685a Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Make the named QColorSpace constructor thread-safeAllan Sandfeld Jensen2020-10-101-5/+24
| | | | | | | | | | | Avoid accessing the shared pointer table without using atomic. Cleans up the shared table on exit for leak tracking utilities. Change-Id: Ia2d6d79dea1c8be02bae2d8111e290f49eedf409 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from commit cd0b5bba9a1a76e03d4b9b5105c4d16d1e1dfd1e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Deal with {und,ov}erflow issues in QLine's length handlingEdward Welbourne2020-10-093-29/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use std::hypot() instead of sqrt() of a sum of squares. This ensures length() can't be zero when isNull() is false. Use length() in QLine::setLength() rather than duplicating that. Clarify and expand some documentation; isNull() never said what constituted validity, nor did unitVector() mention that is should not be used on a line for which isNull() is true. Make clear that lines of denormal length cannot be rescaled accurately. Given that we use fuzzy comparison to determine equality of end-points, isNull() can be false for a line with displacements less than sqrt(numeric_limits<qreal>::denorm_min()) between the coordinates of its end-points (as long as these are not much bigger); squaring these would give zero, hence a zero length, where using hypot() avoids the underflow and gives a non-zero length. Having a zero length for a line with isNull() false would lead to problems in setLength(), which uses an isNull() pre-test, protecting a call to unitVector(). (It was already possible for a null line to have non-zero length; this now arises in more cases.) Tweaked QLine::setLength() to allow for the possibility that the unit vector it computes as transient may not have length exactly one. Add tests against {ov,und}erflow and divide-by-zero problems in QLine. This fixes two oss-fuzz issues: oss-fuzz-24561 and oss-fuzz-25178. Change-Id: I7b71d66b872ccc08a64e941acd36b45b0ea15fab Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> (cherry picked from commit 1c591fd9246ca776304a3c370dd2578bd886feac) Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Avoid double pixel-ratio scaling of dbus tray iconsAllan Sandfeld Jensen2020-10-092-11/+14
| | | | | | | | | | | | QIcon::pixmap does automatic scaling to DPR by default, so use QIconEngine API to access internal pixmaps directly instead. Task-number: QTBUG-83806 Change-Id: I3ccbed8387811a87bbea3f5d4ad9963e1be28a49 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit e5e89d17b36a808192aa5b0c949a4ac1fc4a08ea) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* CMake: Do not use versionless targets in examples (Qt Core)Kai Koehne2020-10-092-6/+6
| | | | | | | | | This is confusing, especially because it's not used in the whole snippet. Change-Id: Ibd59646da2c77ac19a38441021c5e99f52015c95 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 4de97909b20ca86145c4e8f6d33f12f193ec218e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_QTcpSocket::connectToHostError - increase the timeoutTimur Pocheptsov2020-10-081-4/+5
| | | | | | | | | | | | As suggested by the message from QTestLib. This, indeed, fixed the sadistic test. Also, make sure resources are not leaked. Fixes: QTBUG-87009 Change-Id: Id693a5a562ea5ebacc853e5fc0ab9654ba851e72 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit cd6d53610ae9a4d075e8575235ce3c8bd893cf2a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Blacklist tst_QUdpSocket::writeDatagramToNonExistingPeerHeikki Halmet2020-10-081-4/+2
| | | | | | | | | | | | | tst_QUdpSocket::writeDatagramToNonExistingPeer is also failing with MinGW Task-number: QTBUG-74542 Task-number: QTBUG-80328 Change-Id: I44b886a1fc1eac34deefc34690c6701063a49d8f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit cf0f1e08600edd508969d0f76c9dee49d469b7b3) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* QUrl::fromLocalFile: accept invalid hostnamesThiago Macieira2020-10-082-3/+26
| | | | | | | | | | | | | | | | | | | | QUrl hostnames must be compliant with STD3, but we must somehow accept file paths that begin with double slash but aren't valid hostnames. Because the file URI spec requires us to start with "file://" anyway, we can represent those with four slashes. Note that on Unix "//X/y" is a valid but local file path. If given to QUrl::fromLocalFile(), if the path at the root does parse as a hostname, we will still try to normalize (the above becomes "file://x/y"). [ChangeLog][QtCore][QUrl] Changed QUrl::fromLocalFile() to accept Windows UNC paths whose hostname component is not a valid Internet hostname. This makes QUrl able to accept extended-length paths (\\?\), device namespace (\\.\), WSL (\\wsl$), etc. Fixes: QTBUG-86277 Change-Id: I3eb349b832c14610895efffd1635759348214a3b Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit 97de53ee8cce3dc6347b08668f0de45e1000f01c)
* tst_QUrl/Win: test QUrl::fromLocalFile with backslashesThiago Macieira2020-10-081-6/+17
| | | | | | Change-Id: I3eb349b832c14610895efffd1635752ccc82889a Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit dfa35ee6c8c919ccf1ae378074cf1b5501c24d9e)
* tst_QUrl: give the to/fromLocalFile test rows proper namesThiago Macieira2020-10-081-52/+60
| | | | | | | | No change in testing, juts changed names and order. Change-Id: I3eb349b832c14610895efffd16357498454bcd52 Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit 4e0028895793f656488431179a4ee9c4f61f05fa)
* Fix use of \inheaderfileTor Arne Vestbø2020-10-071-1/+1
| | | | | | | Change-Id: Ib969d6cf23b874e873cfc82b1b19dff2a4fe5f8f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 539cd49cee388189793c4691c4ce904825e156b2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix typo in snippetPaul Wicking2020-10-071-1/+1
| | | | | | Fixes: QTBUG-87259 Change-Id: Ife8d2a44e5a8641d42af7cc4bae3425c7ea9affb Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* WinTab: Fix updating tablet pressure resolution on every proximity enter eventDmitry Kazakov2020-10-061-0/+5
| | | | | | | | | | | | | | The user can switch pressure sensitivity level in the driver, which will make our saved values invalid (this option is provided by Wacom drivers for compatibility reasons, and it can be adjusted on the fly). See the bug: https://bugs.kde.org/show_bug.cgi?id=391054 Change-Id: I6cfdff27eaf5a587bf714871f1495a7ea150c553 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit f80026ef9a74ddf33bf3a717291c55a63e577650) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* End touch->mouse synthesis when the chosen touchpoint is releasedShawn Rutledge2020-10-062-23/+49
| | | | | | | | | | | | | | | | | During delivery of a TouchBegin event, if no widget accepts it, we begin treating the first touchpoint as a synth-mouse, as before. If a second touchpoint is pressed or released in any order, it's irrelevant: the fake mouse button is released as soon as the first touchpoint is released. This fixes the bug that such a scenario caused the mouse release not to be sent, so that a widget could get "stuck" in pressed state. Done-with: Tang Haixiang <tanghaixiang@uniontech.com> Fixes: QTBUG-86253 Change-Id: I7fbbe120539d8ded8ef5e7cf712a27bd69391e02 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f51e6552e361c0716f6301b4c5b03b12e8bfe0fe) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* macOS: Update slider metrics by explicitly asking it to layoutTor Arne Vestbø2020-10-061-33/+4
| | | | | | | Change-Id: I283771624b513f4e8844c6130898ddf2531df0f1 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 5930a0ebc0b177b3359d461548a200531fe4774e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Do not generate CMake files for bootstrap libKai Koehne2020-10-061-0/+2
| | | | | | Fixes: QTBUG-86883 Change-Id: I274cc4ea67bf1e2975c0d951c657568426c0e0b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QCalendar: fixup includesGiuseppe D'Angelo2020-10-061-1/+1
| | | | | | | | | Remove an unused one, and add a used one. Change-Id: Ic8b2fc7d0fa1e703b7cbbc622b98a626dd0f6ced Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit f0162415f127c44126a33b94716a5163feb481ff) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Break out calendar backend-from-enum as a static functionEdward Welbourne2020-10-061-27/+38
| | | | | | | | | | | This lets the registry's populate() avoid recursing into constructors that are typically what (indirectly) called it. This, in turn, makes it possible to assert the constructor from enum gets what it expects. Change-Id: I190f9dcfe405e3ee1c6a3f0926fa33cf9ddf64e0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 48cc034c3fad709e7c145a3793d6521b944b36c2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* xdgdesktopportal: properly fix a dangling pointerGiuseppe D'Angelo2020-10-061-6/+5
| | | | | | | | | | | | | | | | | The previous fix didn't actually work, as it kept a reference into a container which could have been muted by the time the reference was going to be used. Use an index instead. Amends 32c09ea5b0f529418eece63de5c3b2c206f62896. Change-Id: Ib855b4a663c281467e46536b98a0ce2b961f19ee Task-number: QTBUG-87143 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 45a0c68c8c0b373152f4aec511bc150f431ad9e3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix a bug in the initialization (and debug-output) of BSP treesAndreas Klots2020-10-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | On a horizontal split the current rectangle is split along the y-axis, creating two children with the dimensions [x, y, width, height / 2] and [x, y + height / 2, width, height / 2] respectively. When the BSP tree is initialized, the type of the root node is set to "Horizontal". However, the offset of the root node is wrongly initialized with a split along the x-axis instead of the y-axis. This leads to wrong behavior on QGraphicsScenes with a non square aspect ratio. E.g on a QGraphicsScene with an apsect ratio favoring the y-axis, every item between yItem = sceneWidth/2 and yItem = sceneHeight/2 will be added to the wrong leaf. [ChangeLog][QWidgets][QGraphicsScene] Fixed a bug in the initialization of BSP trees to increase the performance of QGraphicsScenes with non quadratic scene rectangles. Fixes: QTBUG-87174 Change-Id: I360033e94e22eb961f820278993754d10bfc1e45 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 40874625f996899ca1e976f0240da697e784c2c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve QWizard visuals for macOS dark modeDavid Skoland2020-10-061-10/+30
| | | | | | | | | | | | | | | | | | This did not account for macOS dark mode, with hardcoded white, but now it correctly updates the colors from palette whenever the theme is changed. Additionally changed some bool checks to make sure the code runs on macOS theme updates. Do note that this change affects Qt Maintenance Tool (in a good way). Change-Id: I6fb92d3f6c15a7ff83d0d8a30cf82477b6aba126 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io> (cherry picked from commit 62fed23fefef0738ef55a17f96efd49e30313152) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: use shell path format when running qmake install stepAssam Boudjelthia2020-10-061-1/+1
| | | | | | | | | | | On Windows shell, using unix path format might not work, since the shell expects backslash paths only. Task-number: QTBUG-87066 Change-Id: I51741b475c1ede11336df63ee1c6092c792c16ef Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e60a337f4ed5c716b87f2318a2595c793fb4bca8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Close popups on windowWillMiniaturize notificationTimur Pocheptsov2020-10-054-10/+23
| | | | | | | | | | | | | | | | We do this on windowDidMove/windowWillClose, but we don't on a 'will miniaturize' notification. This can leave an application with an orphan popup window, such as context menu which looks really weird. I err on a safe side though - I don't close all popups - the application's logic can be such that it has several windows and one of them gets minimized (we can do this via QWidget's interface, for example) - would be strange if all popups close. So I only close popups that have the miniaturized window as a transient parent. Task-number: QTBUG-77833 Change-Id: Ib655a27c0ce8661f9e7156e6035f7fffaff901b1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 048e66a11d87845eaba9e8cf23de3fb4acac924d)
* Doc: Qt GUI: Depend on qtprintsupport documentation moduleTopi Reinio2020-10-051-0/+1
| | | | | | | | | | This adds 'Inherited by:' links to print support classes deriving from Qt GUI types. Task-number: QTBUG-77126 Change-Id: I84ecee5df8cae0635d42653b1483db6b3c6074ee Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fc141be890f265db41a0143f49e9b62537a069aa)
* QAIM docs: use \nullptr instead of 0Giuseppe D'Angelo2020-10-031-2/+2
| | | | | | | Change-Id: I30b541f28ba8271eb4234c7f642485a1614808bf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit f478905068647495da04dcdb193457f2199835d6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Ignore mouse events where globalPos contains NaNSteffen Kieß2020-10-021-0/+5
| | | | | | | | | | | | | | | A NaN value in globalPos can cause an endless recursion in QGuiApplicationPrivate::processMouseEvent() when e->enhancedMouseEvent() is true and this is not a move event. When an event contains a NaN in globalPos, print a warning and ignore the event. Fixes: QTBUG-86207 Change-Id: I8789e465921789569715e52c98193f91945ea982 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 63bbbdc4b8dba7be5690065dc6a4ffa5a85b1b32) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QTreeView: fetch as many nested entries as fit into the viewVolker Hilsheimer2020-10-022-2/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractItemModel::canFetchMore and fetchMore implementations might only add a few rows to the model each time they are called. The item views don't generally expect that, and don't call fetchMore repeatedly, even if there would be room in the itemview for more data. This problem cannot be generally solved for all item views, as it would require in repeated expensive laying out of items. For nested indexes in a treeview however, we can try to fetch enough child rows to populate the screen when the item is laid out by repeatedly calling canFetchMore and fetchMore. To calculate how many items have space, apply the same heuristics as in the scrollContentsBy implementation to guess the number of items that can fit into the viewport. Created test case for the fix. Done-with: Doris Verria <doris.verria@qt.io> Fixes: QTBUG-85366 Change-Id: I54f95552993873dd4cba80b0f70f4db9d98ddc1d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit e74af68654c0eb127277c73e20bda409b83d157b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Reference proper SplitBehaviour enum in docsNicolas Fella2020-10-021-1/+1
| | | | | | | | | | QString::SkipEmptyParts is Qt::SkipEmptyParts now. Change-Id: Ie351bbe9d2350e771f821a9f0bc9f581be5b0022 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 2d8d8ab8c2a1386878429f57f6069d2f86f7708b) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Do not assert on invalid ICC curv tableAllan Sandfeld Jensen2020-10-022-17/+35
| | | | | | | | Reject invalid table data, do not assert it. Change-Id: I1fdda4c735bb97bb93ac8f8654ac4cc5fada5389 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit e750fa8509d350cbbcddc81174516745f6ffe9f3)
* QAbstractItemView: Don't allow CopyAction for InternalMove viewsVolker Hilsheimer2020-10-021-0/+2
| | | | | | | | | | | | | | | | Otherwise the default action will be Copy, and the (+) cursor will show when moving items in e.g a QListView/Widget, even though the item will actually be moved. The documentation of InternalMove states clearly that "The view accepts move (not copy) operations only from itself.". Task-number: QTBUG-87057 Change-Id: Idaa9e8f84623ced51b1c51a3730466dc0678d6b3 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 60eb306efe786f645ceb15a4e60cdbb90afff1d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix race condition in QThreadPool::clearAllan Sandfeld Jensen2020-10-012-3/+29
| | | | | | | | | | | | Since we drop the lock while deleting threads, we need to handle the queue possibly being accessed and changed by the pool threads while clear() is running. Fixes: QTBUG-87092 Change-Id: I7611edab90520454278502a58621e299f9cd1f6e Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit fe36d47b371b71ad5fec30d4b5d7bf0baa0205ea) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Revert "Blacklist tst_QWindow::exposeEventOnShrink_QTBUG54040"Liang Qi2020-10-011-1/+0
| | | | | | | | | | | | This reverts commit b1ef104866f78ae5bbc1214ae524bad4120ef0e2. This test is BPASS on openSUSE_42_3 for 5.12 and PASS on openSUSE_15_1 for 5.15. Change-Id: Ia1d81ed38491c27c01f270623c5082663f4da699 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit be7d46f5e2b8b4109bcb1ef1f5e765e87354aa9b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Emit QScreen::geometryChanged when the logical DPI changesFriedemann Kleint2020-10-012-6/+11
| | | | | | | | | | | | | | | | | | | | | Add the missing call to QScreenPrivate::emitGeometryChangeSignals() along with an emission of physicalDotsPerInchChanged() since that is calculated from geometry and physical size. Rearrange the code in QGuiApplicationPrivate::processScreenGeometryChange() to prevent duplicate emissions of geometryChanged(), physicalDotsPerInchChanged() which this change would introduce. Amends 5290027e3bab75f14fc0a2b7c206594d9cb91e76. Task-number: QTBUG-76902 Task-number: QTBUG-79248 Fixes: QTBUG-86604 Change-Id: I3dc2ec5ccd9c6413e92f9246242f323e8afc5e57 Reviewed-by: David Edmundson <davidedmundson@kde.org> (cherry picked from commit 5c7307775d32ae0a54acad8ae7a1c9d3cff7d45e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Properly deprecate QProcess::pidVolker Hilsheimer2020-10-015-5/+8
| | | | | | | | | | | | Address an old ### Qt 5 comment. The method has been documented as deprecated and replaced by QProcess::processId since at least Qt 5.9, so we can first properly flag it as such for 5.15.2, and remove it from Qt 6 in a follow-up commit. Change-Id: Ic4e3351740617083b16723db8eef7a341bccfbf6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 3fb8f9e44e8cbf5937257505d0bc2d1457a26da1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tests/xcb: fix tst_QWidget::updateWhileMinimized() - againLiang Qi2020-09-301-1/+2
| | | | | | | | | | | | | This amends 4403ec3bc1501cde454b0546759d4c27f9b6cb1b. CentOS 8.1 uses GNOME in XDG_CURRENT_DESKTOP. Task-number: QTBUG-68862 Change-Id: Ia9a6f7f4c47853fc53d9860dad070109271a438e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit b05e444a923e8362b6912da6dcda8247f7233322) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Doc: Fix incorrectly placed closing bracket in Q_PROPERTY codeKai Koehne2020-09-301-2/+2
| | | | | | | | | Amends cb3152086c61e7c Change-Id: I1615a686a53da7ca5ae454565283c9e83399d947 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 0836db2330c0542d91fe61935e97d3369db93156) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove license header templates from qtbaseJani Heikkinen2020-09-3011-344/+0
| | | | | | | | | | After 66d6030924e968dffd98ba88d1382e8b08cc521d those are located in qtqa instead Change-Id: I2b07638d30affe3e2826a231a31d34cfe7e9e4c6 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit d90647b26a95d88b57fa9e3fec3a821efb226de2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't disable non-existent MSVC warning C4345Marcel Krems2020-09-301-1/+0
| | | | | | | | | | | | | This warning was removed in MSVC 2013: https://docs.microsoft.com/en-us/previous-versions/wewb47ee(v=vs.120) Disabling it causes warning C4619: #pragma warning: there is no warning number '4345' Doesn't apply to dev, since it was already removed in b42a2b3c3338a320a438bc081cb885fd4547f01f Fixes: QTBUG-87047 Change-Id: Ie89743d0e335a7ccded12c0265967fca49c95e70 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QJsonObject: fix sorting after parsing from JSON textThiago Macieira2020-09-302-37/+54
| | | | | | | | | | | | The logic was complex and missed the UTF-8 UTF-8 case. It ended up calling the UTF-8 to Latin1, resulting in an improperly-sorted container, which in turn meant keys were not found when searched. Fixes: QTBUG-86873 Change-Id: I0d3ff441bec041728945fffd16379dec418637ca Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit f00d322f6701580f97f38794b83b0ec13973d177) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QCocoaDrag - set image only on the first drag itemTimur Pocheptsov2020-09-281-2/+7
| | | | | | | | | This image is already a combined image of all urls that we drag. Change-Id: I8fe45f64a6022881320d100f8a6f4a25fcac73b9 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 7ee9bfc158a290776f622f62d0202220c6d159bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't guess UTC when we can't find a system zone nameEdward Welbourne2020-09-283-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | If we're able to load a system zone without knowing its name, we shouldn't claim that its name is UTC. Instead, use the system zone information's name for the zone. Let the backend return an empty string if it can't determine the system zone ID, provided it has some way to get system zone info despite not knowing its name. This can happen on Windows if the system zone is one of Microsoft's idiosyncratic names that we don't recognize; or on Linux if /etc/timezone is a copy of a zoneinfo file, instead of a symlink. In support of that, handle empty ID as a request for system zone info, so that the backend constructors taking an IANA ID never get passed an empty ID; that gets routed to the default constructor instead. This incidentally restores QTzTimeZonePrivate's behavior, for empty ID, of reading the content of /etc/timezone if we are unable to determine the name of its zone any other way. Fixes: QTBUG-86306 Change-Id: Iad57c18199124f651ebc3d32c3deffca6eaab512 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit b12d6c6a8ab5f7b01bdd2cb862a66a409700faa1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: Ia7ec488983d75ccec68a935abd49fddb58c4adfc
* qlist: Replace QT_DEPRECATED_X with proper QT_DEPRECATED_VERSION_X_Albert Astals Cid2020-09-271-5/+5
| | | | | Change-Id: Iba3ade5828af13e49afd3e48dfec8ae52207c05c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Android: allow Android app building to use java 8 featuresAssam Boudjelthia2020-09-261-0/+5
| | | | | | | | | | | Enable Gradle builds to use Java 8 features like lambda expression by default. Task-number: QTBUG-86282 Change-Id: Ib497b8a789690fcca6e13ea4995e5966331c6c0d Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 5a158a9512564c4e0642027d552bb5d9b3ac75af) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't error out when configuring Qt on a headless systemVolker Hilsheimer2020-09-261-4/+5
| | | | | | | | | | | | | | | | Configuring and building Qt should not require a running dbus session bus. However, when building the html_docs target on a headless system, qmake bails out with error if dbus is linked in, while only showing a warning if it's not. This is unnecessary. We can warn in both cases, build the tests with dbus linked in. Running the tests will fail if there is no session bus, ie. tst_QDBusConnection_Delayed::delayedMessages fails with QVERIFY(session.isConnected); (adapted from d26fe3c5d6d73b0663a33d2f25ed053cc1f70d5e) Change-Id: Ia6b6e226398e87880449b003d28dfd76553bee2c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Avoid heap-buffer-overflowRobert Loehning2020-09-251-0/+2
| | | | | | | | | | [ChangeLog][QOutlineMapper] Avoid heap-buffer-overflow Fixes: oss-fuzz-24615 Change-Id: Ia67e1fb830850d04f068d8b5c009687f3deff156 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 74146e0102d367c5e7a3567ad6bf8a46548d55de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* xcb: Avoid BadMatch error when creating non-OpenGL windowAlexander Volkov2020-09-251-13/+3
| | | | | | | | | | | | The Xorg Server requires colormap when creating a window if the window's parent either has a different visual or has no colormap. To simplify logic and avoid extra requests, create a new window with colormap unconditionally. Change-Id: I21a53f9146ae0a03b38bb3a07c8a478043a2eb89 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 065c4021adab9dee72d0cb815a27e17e8fc4db1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 11:40:50 +0000