summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Blacklist test that times out on windows5.12.7Dimitrios Apostolou2020-04-231-0/+4
| | | | | | | | | | It seems something is going on with infrastructure and all windows VMs are slower. Blacklisting until we figure it out. Task-number: QTBUG-82717 Change-Id: Icab430125747df0a2d0ea4da8093a33ae75c5f13 (cherry picked from commit 19aa8de06cf43aa375aeb2609003beb71ad4cac0) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-241-0/+25
| | | | | | Change-Id: I09407d3a542fe73e7788785b4d8ff952cbbfb9ed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix CVE-2019-19880 in SQLiteAndy Shaw2020-01-242-0/+32
| | | | | | | Fixes: QTBUG-81565 Change-Id: I6bf2364e696315e5262d1abfa2f0b6947f14a33b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f59ef938ce384b80819bcea660cf8626ff1789e7)
* QLibrary/Unix: do not attempt to load a library relative to $PWDThiago Macieira2020-01-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | I added the code in commit 5219c37f7c98f37f078fee00fe8ca35d83ff4f5d to find libraries in a haswell/ subdir of the main path, but we only need to do that transformation if the library is contains at least one directory seprator. That is, if the user asks to load "lib/foo", then we should try "lib/haswell/foo" (often, the path prefix will be absolute). When the library name the user requested has no directory separators, we let dlopen() do the transformation for us. Testing on Linux confirms glibc does so: $ LD_DEBUG=libs /lib64/ld-linux-x86-64.so.2 --inhibit-cache ./qml -help |& grep Xcursor 1972475: find library=libXcursor.so.1 [0]; searching 1972475: trying file=/usr/lib64/haswell/avx512_1/libXcursor.so.1 1972475: trying file=/usr/lib64/haswell/libXcursor.so.1 1972475: trying file=/usr/lib64/libXcursor.so.1 1972475: calling init: /usr/lib64/libXcursor.so.1 1972475: calling fini: /usr/lib64/libXcursor.so.1 [0] Fixes: QTBUG-81272 Change-Id: I596aec77785a4e4e84d5fffd15e89689bb91ffbb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit e6f1fde24f77f63fb16b2df239f82a89d2bf05dd) Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* QWidget: React to platform surface being created or destroyedTor Arne Vestbø2020-01-232-0/+71
| | | | | | | | | | | | | | | | The platform window may create or destroy its surface from other entry points than the QWidget API, in which case QWidget needs to sync up its own state to match. In particular WA_WState_Created and the winId needs to be recomputed. Fixes: QTBUG-69289 Fixes: QTBUG-77350 Fixes: QTBUG-80859 Change-Id: I769e58ead3c2efcf8c451c363108848feade9388 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 009abcd7b66738bece6cf354776dfb2ef401636b) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge 5.12 into 5.12.7Kari Oikarinen2020-01-236-967/+1085
|\ | | | | | | Change-Id: Ibc8bb93b238b79c7beacbb69ed2f691333af3af4
| * eglfs: find correct framebuffer index even if device node is symlinkRolf Eike Beer2020-01-221-1/+7
| | | | | | | | | | | | | | | | | | | | | | Using the Vivante driver on a board with different device trees I found the need to let udev point me to the framebuffer actually connected to HDMI by adding a symlink. Since the extraction of the framebuffer index failed and always returned 0 the GUI still always showed up on the first framebuffer. Change-Id: Ib4aa0fdd6e85d296c17fd977921cbc78e52dcdcf Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit dd23313d66846022894b56ad25b6c2c0fdb54762)
| * Fix CVE-2019-19646 in SQLiteAndy Shaw2020-01-212-1/+32
| | | | | | | | | | | | | | Task-number: QTBUG-81020 Change-Id: I7176db20d4a44b1fb443a6108675f719e9643343 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 3b697f496303bd005ae9d1d2c974efeed259d8a3)
| * Update enterprise license agreement v4.2.1Jani Heikkinen2020-01-191-959/+1005
| | | | | | | | | | | | | | Task-number: QTBUG-80661 Change-Id: Ic730a83465dffa2b1076c03a47d6f97a3a9a53a5 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 860d10247425937de1dd48976e3677ced0f509d2)
| * Add touch input device mapping support via QT_QPA_EGLFS_KMS_CONFIGPasi Petäjäjärvi2020-01-182-6/+41
| | | | | | | | | | | | | | | | To be feature parity with evdev touch which already supports this Change-Id: Ie7f9c868ea888725b24c3855106e1c0c0ba943a9 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 6224130cc821b0ef0dbdda80837e872c7996b916)
* | Bump copyright yearJani Heikkinen2020-01-208-11/+11
|/ | | | | | | | Change-Id: I9468ef21a2cf03cf07c38f012a2aa9bae6d02a03 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 1e42c97cf055ac20352d20150e2786c14565ea2b) Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* QObject: make the connectedSignals member use QAtomicIntegerThiago Macieira2020-01-152-6/+7
| | | | | | | | | | | | | | | The bitfield is always mutated under a mutex lock, so there's no need for atomic bit operations. This is needed because there's one outstanding access (in isSignalConnected()) that is done outside the mutex. Not needed in 5.14 because commit a5a859e721e7a1d0c5a3ec6abe2db55d9144bb36 removed the bit field altogether. Fixes: QTBUG-81376 Patch-By: Chris Thornton Change-Id: Idc3fae4d0f614c389d27fffd15ea1d372968f8f1 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Guard against null-nativeParent in QWidgetBackingStore::markDirtyOnScreenTor Arne Vestbø2020-01-151-1/+5
| | | | | | | | | | The back port in 1e310b5a4508f removed the check in two of the call sites for this function, that in 5.14 were handled elsewhere, but for 5.12 caused us to not guard against null-nativeParent windows anymore. Change-Id: I698c5a0b6a54bbee37b533fcafa75129768c5db1 Fixes: QTBUG-81315 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Fix configure after updating qt license fileJani Heikkinen2020-01-152-3/+1288
| | | | | | | | | | | | | License file (LICENSE.QT-LICENSE-AGREEMENT-4.0) was recently updated to version 4.2 and that broke the configure. Remove qt license file version number from file name to avoid configure update need when license file is updated Change-Id: I77b4a4e7c6e590bbbce79d1c86cbcfb965841eae Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a5cbff60f063d271500e31eba5bd236741d2367b) Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update Qt enterprise license agreement file to version 4.2Jani Heikkinen2020-01-152-913/+1285
| | | | | | Change-Id: I4c42f92bda472aad5b0a0ebb92c6a982f1f64714 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io> (cherry picked from commit 0b2f13924263ad37e1654a856deb26601d09c4b4)
* Use QPointer for QWindow pointers in QGuiApplicationMorten Johan Sørvig2020-01-142-6/+6
| | | | | | | | | Guard against stale pointers; Use QPointer instead of raw pointers for QGuiApplicationPrivate state variables. Change-Id: Ie4f980f13dafe9729c1898b8fac7d26a87d2ca59 Fixes: QTBUG-80355 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Fix CVE-2019-19645 in SQLiteAndy Shaw2020-01-132-1/+93
| | | | | | | Task-number: QTBUG-81020 Change-Id: I58b1dd9e7a90ba998c3af7f25a4627d8bdd70970 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1e89c132e1280276e1d3a82ec3464afec8c14c3a)
* QKeySequence: Add missing names for multimedia keysAlexander Volkov2020-01-131-0/+6
| | | | | | | Task-number: QTBUG-40030 Change-Id: Ib34bcbf42d6dd1206209c2d76444fd8c777278fe Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit fcbf15c97bac91a889eccaa0cfad10093fd052f0)
* Fix CVE-2019-19603 in SQLiteAndy Shaw2020-01-122-6/+121
| | | | | | | | | | | This includes the patch needed to fix this CVE and a supporting one to include a new function added that it depends on. Task-number: QTBUG-80903 Change-Id: Ic7639d50c89a3ee7d45426588c3ab0efd0eebb72 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit a75d238b3194ae4973be7f6ce0508a526d4aa49e)
* ucstrncmp: Fix UBSan report of array overflowingThiago Macieira2020-01-111-4/+4
| | | | | | | | | | | | | | | | The expression "a + offset + N" will eventually calculate an address past the end of a, since we are comparing to end. That's undefined behavior. Instead, calculate end - a and compare that to offset + N. This commit subtracts "a" from both sides of the inequalities and swaps the two sides to make them obey Qt coding style. Testing with GCC 9 (which is the only one I care about) shows the compiler generates the same code. Fixes: QTBUG-81218 Change-Id: Id84da383373844f3a4b0fffd15e7c1ab904daccd Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> (cherry picked from commit 64359ad710756e7cca5ca553521b2aada18fb0fe)
* Fix CVE-2019-19242 in SQLiteAndy Shaw2020-01-102-1/+37
| | | | | | | | Task-number: QTBUG-80903 Change-Id: I78a72a574da5cf3503950afe47146ae6424f00c6 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit dcef0b96eef04c4e17c2e51ea71aea1f78625864)
* Fix dependency resolution for extra compilers in VS projectsJoerg Bornemann2020-01-094-29/+17
| | | | | | | | | | | | | | | | De-duplicate the code that calls the extra compiler's depend_command by using the central function callExtraCompilerDependCommand. This one actually tries to resolve dependencies unlike the removed code that blindly resolved relative paths to the build directory. This fixes dependencies reported by uic which need to be resolved against what is in DEPENDPATH. Fixes: QTBUG-80579 Change-Id: If482e50ff3eff716fefffee82004acc076b3a547 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 9d7ed92f6e63cd2d1a1388874e54b37b5cfd01b7) Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* De-duplicate code for calling extra compiler depend_commandJoerg Bornemann2020-01-092-80/+60
| | | | | | | | | | | Flesh out copy-and-pasted code into a function and adjust the coding style on the go. This refactoring is needed for a subsequent fix. Change-Id: I9b8a87d6dd5c33cc1ed9f613fe85daca52309369 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> (cherry picked from commit af7e0e735777d7f7d1606049e5261106a092665a)
* sqlite: Update to v3.30.1Andy Shaw2020-01-084-4009/+5304
| | | | | | | | | | | | Since the patch applied previously is no longer required, we have removed that too. [ChangeLog][QtSQL][sqlite] Updated to v3.30.1 Fixes: QTBUG-79416 Change-Id: Ifc3fcc6e1768f80e97a5e0ab4b2aeabddf2ced9d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 11acbc2c9928603dae6b4e2f1ca8b745e766f92b)
* Merge "Merge remote-tracking branch 'origin/5.12.6' into 5.12"Qt Forward Merge Bot2020-01-085-5/+66
|\
| * Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-075-5/+66
| |\ | | | | | | | | | Change-Id: Idcbf469ddcd6824f97a56c5e3a2e5fcc1d9706cf
| | * iOS: Account for UITextInteraction when building against 12.x or lowerv5.12.6Andy Shaw2019-11-081-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In iOS 13.0 we can handle UITextInteraction as normal, but in lower versions it is not available to utilize at compile time. So we have to check for the other types instead and return if it is not one of those. Change-Id: Icbc5558e677ed40c03f30a174e2d79b87f489f68 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 3916b8a28bc9c55e10f4de611ed76e17017494aa)
| | * Merge 5.12 into 5.12.6Kari Oikarinen2019-11-073-3/+36
| | |\ | | | | | | | | | | | | Change-Id: I281538c2c9fc5d97a4b65d8add80e4eb1407ab7d
| | * | Add changes file for Qt 5.12.6Antti Kokko2019-11-061-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff5f92f9d947a8b557aab87a36b3a91e335d1a4b Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * | Ignore non-existent .ui file dependenciesJoerg Bornemann2019-11-063-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 80dea664 broke .ui files with global includes that are not part of the project, because we blindly added every file path that falls out of 'uic -d' as dependency. Introduce the extra compiler CONFIG flag dep_existing_only to bring back the old behavior that ignores non-existent dependencies and set it for uic. Change-Id: I6eaa82817c932a98ebac6d08115a9815d4b9dd21 Fixes: QTBUG-78144 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 90779d96adfa51a3fc00b6c0d93168b4bbfcf983) Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | macOS: Skip uninitialized buffers in IOSurface backingstoreTor Arne Vestbø2020-01-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-80972 Change-Id: Ifb8eb84d6b802556ccd52ac129a91e142e265a81 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 77f1d0bfa542e166deaa196b3b3b854d33a3a1b7)
* | | | macOS: Handle missing color space information in IOSurface backingstoreTor Arne Vestbø2020-01-071-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-80972 Change-Id: Iab3f1a9cf03251340e5f32bcc73103428e93282d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 105e662221cc90d5002e06c97febf50c5c601336)
* | | | macOS: Don't throw away backingstore buffers when backing properties changeTor Arne Vestbø2020-01-074-30/+30
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clients such as QtWidgets that do their own dirty tracking will assume they can just flush in response to the expose event, without repainting anything. Since we have no way at the moment to inform these clients that the backingstore content might be invalid we can't just throw it away. It turns out that to pick up changes in color spaces we can just tag the existing buffers with the new color space, so we don't need to throw it away. And for the older surface-backed mode we tag the color space on flush, so we didn't need to invalidate anything in the first place. Fixes: QTBUG-80844 Task-number: QTBUG-77749 Change-Id: Icb1ceb178894bb43887cdf03fb855d2d614b5ab0 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 7ac4e55cb979dff890f1575e771e5f2def9e3131) (squashed in commit c027d9b61e15)
* | | Add check for global share context for QOpenGLWidget initializeMichal Klocek2019-12-191-3/+5
| | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-78863 Change-Id: I678f66a2057fb9c98863e19eb09042306e72f68a (cherry picked from commit ce2fc51914f809369d5096e7a0621229dd9eaef9) Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Fix CVE-2019-19244 in SQLiteAndy Shaw2019-12-112-0/+27
| | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-80635 Change-Id: I718349e28ec76ea164dd50f2a985f2074dd6bdbd Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit a7108ec6cfb6411e40a4012f3e6d3b5d5fb9631d)
* | | Avoid crash in menu that was previously shown as submenuAlexander Volkov2019-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset sloppyState for the previous submenu, so that if it will be shown as a menu, it will not use an incorrect pointer. Fixes: QTBUG-80528 Change-Id: If2ba8c3a664983ee76eb90d2c9a8096e2bd0a4e6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 8339ce2155752eb8fa0f49f3fe4b24f9643ae463)
* | | Fix depth in renderText()Laszlo Agocs2019-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-31156 Change-Id: I3cbb3f9c5dfbcb182dbe283b0bf0f05a031970a5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit c625d923853d01ad668dd3e8ebd55b7e5a6bcdb8)
* | | Remove dead code to fix a lint warningLars Schmertmann2019-12-061-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obsolete SDK_INT Version Check ------------------------------ This check flags version checks that are not necessary, because the minSdkVersion (or surrounding known API level) is already at least as high as the version checked for. The mindSdkVersion in templates/AndroidManifest.xml is 16 for Qt 5.12 and androiddeployqt also ensures that the minSdkVersion is not below 16. Change-Id: Ifdb6f773dccdb75c35119df833c976b7b76b3356 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Fix sizeHint of QProgressDialog to have enough space for window marginsVolker Hilsheimer2019-12-031-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some styles, notably QMacStyle, use different margins for widgets and for windows. For these margins to be returned correctly, we have to tell the style that we want them for a toplevel widget. This was done correctly when laying out the dialog, but not when calculating the sizeHint, leading to a default size of the dialog that was too small to fit the text. As a drive-by, change variable names in the sizeHint method to be a bit more readable. Change-Id: Ib4168c7be176fa816241ebcc5f9235db4a7f982f Fixes: QTBUG-80272 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | iOS: Guard against request for textInputView without focus windowTor Arne Vestbø2019-12-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b8df07fffef1cc948f6720685234540a20ccc81 Fixes: QTBUG-79316 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 9ac156c90b92a981f70929e081c64083b14e9a57) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Revert "Fix build with -no-feature-printer"Liang Qi2019-12-021-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit de8bd9ec6b21e3b43b08c4c2588b5116a7ca8ece. We need to keep the empty printsupport library for ios at least. Fixes: QTBUG-79124 Task-number: QTBUG-80323 Change-Id: I543a76a897eec2c9bc51a3f2d080be3a9cc07871 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Fix regression in how "pkg-config --static" output is handledKai Koehne2019-11-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change a1ea49878927dfe2 did replace different pkg-config calls for -L, -l arguments to one. Anyhow, it also removed the eval() call that ensured that the return string was split by whitespace, meaning that paths couldn't resolve anymore properly if multiple arguments were returned. Fixes: QTBUG-79668 Change-Id: I4091fea6891ef79836e05f8e87ffa9d69863a8f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 99e43db7cea1c838993c151d2d40fc2874a94256)
* | | CoreText: Modernize style hint fallback lookupTor Arne Vestbø2019-11-273-131/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DefaultFontFallbacks.plist system file that we used for looking up style fallbacks does not exists in macOS 10.15, nor did it ever exists on iOS. Instead of relying on this file, we hard-code a set of default families, that we then look up the fallbacks for. The result of QFont::defaultFamily() on macOS is now: QFont::Helvetica --> "Helvetica" QFont::Times --> "Times New Roman" QFont::Courier --> "American Typewriter" QFont::OldEnglish --> "" QFont::System --> "Lucida Grande" QFont::AnyStyle --> "Lucida Grande" QFont::Cursive --> "Apple Chancery" QFont::Monospace --> "Menlo" QFont::Fantasy --> "Zapfino" And on iOS: QFont::Helvetica --> "Helvetica" QFont::Times --> "Times New Roman" QFont::Courier --> "American Typewriter" QFont::OldEnglish --> "" QFont::System --> "Helvetica" QFont::AnyStyle --> "Helvetica" QFont::Cursive --> "" QFont::Monospace --> "Menlo" QFont::Fantasy --> "Zapfino" Fixes: QTBUG-78240 Change-Id: Ie9bc13c9c1031d89f024199e4736a046c568a48d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 7f0faddf9fe25adc0a3e0827e21c030d6a7a1035) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Replace get_filename_component usage with REGEX_REPLACEAlexey Edelev2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace get_filename_component usage with custom string REGEX_REPLACE to avoid cutting non-ending suffices while moc generation Fixes: QTBUG-80295 Change-Id: I8cdb729370c6d884f6638d172ee523fdc2df5404 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | eglfs: kms: Read page flip events on a dedicated threadLaszlo Agocs2019-11-2614-43/+354
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74953 Change-Id: I9a630c9245d8b0afe40ade9199cf4f1d358275da Reviewed-by: Andy Nichols <andy.nichols@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 14bb413309092adc53e8451daff5690c4698c07d)
* | | eglfs: kms: Make threaded atomic drm workLaszlo Agocs2019-11-264-41/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The atomic modesetting support was not prepared for page flips being issued from different (per-screen) threads. This could be seen with the threaded render loop of Qt Quick: having a QQuickWindow per screen means having a dedicated render thread for each screen. QKmsDevice used simply instance variables to keep track of the request. This leads to the commit failing with EBUSY sooner or later. Make the atomic request and related variables thread local. This prevents failing drmModeAtomicCommit() with 2 or more screens and the threaded render loop. It does not fix other potential issues when waiting for page flips to complete, that is to be tackled separately. Task-number: QTBUG-74953 Change-Id: I2dac10d5e9bdc0cb556ac78c9643c96d40d692e4 Reviewed-by: Johan Helsing <johan.helsing@qt.io> (cherry picked from commit 5bd48047de4abecc47187d938c5e6ed8b8304aaf) Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Remove the unregistered recognizer from the main listAndy Shaw2019-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This amends 1320b2f64412f0d86bd09c66c22df845e13a94a1 to keep the behavior of removing from the main list but without re-introducing the memory leak. Fixes: QTBUG-77770 Change-Id: I91fa6cb71fab8d60baa35417fdb34322af11dbbb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 7d73d4b9a93b3132c1a24aa3ae77f0a307e821fd)
* | | Windows QPA: Fix close button not working on Windows 7Andre de la Rocha2019-11-131-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous change modified hit testing in the non-client area of fixed-size windows, in order to prevent showing a resize cursor when the windows are not resizable (QTBUG-77220). The change assigned HTCAPTION for any point over the entire title bar, including the top bar buttons, which on Windows 7 classic or basic desktop caused these buttons to become unresponsive. The present fix changes this behavior to redefine only the outer sizing frame, while letting the rest of the title bar be handled by DefWindowProc(). Fixes: QTBUG-78262 Change-Id: Id6e821a805c8333a67988f87c3727bed0c93290e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit a8ec52d5e76bc769ed63be1ad543be8f687e5dac)
* | | Do not load plugin from the $PWDOlivier Goffart2019-11-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I see no reason why this would make sense to look for plugins in the current directory. And when there are plugins there, it may actually be wrong Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit bf131e8d2181b3404f5293546ed390999f760404) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Bump versionFrederik Gladhorn2019-11-071-1/+1
| |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 02:50:04 +0000