summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SQLite: Update SQLite to v3.37.2v6.2.46.2.4Andy Shaw2022-03-023-43/+87
| | | | | | | | | | Fixes: QTBUG-100907 Change-Id: I6e31b2ba19443ed6554a343423dcfd2ca6d0ac2f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit baa2d09d0d085843600282b19ec6f2362d4c8a79) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 68e80fdfef61e0458cd52361726b7e6a0f2e2495) Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Make QGuiApplicationPrivate::lastCursorPosition.toPoint() safe to useShawn Rutledge2022-02-233-4/+26
| | | | | | | | | | | | | | | | | | | | QGuiApplicationPrivate::lastCursorPosition is initialized with qInf(); so before Qt has seen a mouse move event, attempting to convert to QPoint is an error. It's best to have one place where we do the qIsInf() check rather than several (and otherwise prefer using the QPointF as-is rather than converting to QPoint at all). Introduce a helper class that contains a QPointF, and provides a safe conversion to QPoint, as well as simple accessors for clients using QPointF. Fixes: QTBUG-52472 Task-number: QTBUG-45045 Change-Id: I83fad1bfb658e03fa876344552f1d5bb751d9f81 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit c5792dcfd631abb4f9e2b92cd6e88d7e5c373406) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Always include qt_windows header firstVolker Hilsheimer2022-02-234-3/+4
| | | | | | | | | | | qt_windows takes care of setting NOMINMAX, which prevents native headers from defining `min` and `max` as macros, breaking the build. So include that header always as the first header. Change-Id: I82cd8b21d263102000e6e66f135465bc2c126db4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 29a7489769bca59630782061789561fb07d77892) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* configure: Remove declaration of the DBUS_[HOST_]PATH variablesJoerg Bornemann2022-02-221-2/+0
| | | | | | | | | | | These variable were used in Qt5 to specify the install location of the DBus library. In Qt6, pkg-config and the usual CMake mechanisms are used. Change-Id: Ic3d61d50c1051200c12bac861dc1fbfe0cb8a4a1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 1bc41f7a7e9b514d198a0dbd319921764f4e31e2) Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* configure: Remove declaration of the MYSQL_PATH variableJoerg Bornemann2022-02-221-1/+0
| | | | | | | | | | | This variable was used in Qt5 to specify the install location of the MySQL library. In Qt6, MYSQL_INCLUDE_DIRS and MySQL_LIBRARIES serve this purpose, and MYSQL_PATH is unused. Change-Id: I2df12b79777af50c719a5b6bc5feadc2c59c0c3d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit eb6fc1cab9ebd5233f99610659afb9be6cfb465a) Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* configure: Remove declaration of the OPENSSL_PATH variableJoerg Bornemann2022-02-222-4/+1
| | | | | | | | | | | This variable was used in Qt5 to specify the install location of the OpenSSL library. In Qt6, OPENSSL_ROOT_DIR serves this purpose, and OPENSSL_PATH is unused. Change-Id: I40cc412bb35666dac3dd134ca8bfb67f3d524f80 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit ce34ed6eabba45546dc40ce0b22b872a69cacd87) Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* CMake: remove obsolete #FIXMEThiago Macieira2022-02-211-1/+1
| | | | | | | | | Also confused Qt Creator. Change-Id: Ic15405335d804bdea761fffd16d4f209df4311a8 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e5373a043d6fb04e8e0298fdf6a12b5429c2d89a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QMetaType::typeName returning wrong result for clang-clAlexander Neumann2022-02-201-2/+4
| | | | | | | Change-Id: I94fa1d56d98b8caae514b37fbf6432985195d827 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit d49f5752a560d7c8fec99c57bbfb192a9be1b296) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Document change to style sheet selectors for enum propertiesVolker Hilsheimer2022-02-201-0/+21
| | | | | | | | | | | | | | | The change is presumably an unintentional side effect of QVariant and QMetaType system changes in Qt 6, but it arguably is a good change. Document it in the porting guide, while evaluating whether (and figure out how) we want to support integer values as well. Task-number: QTBUG-99642 Change-Id: Id1589c594bcdc2afe5c4fd0e47a158cd5e03e52f Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 2d935dc7f9d80f0a7b83111695a23b3b5bb99a31) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix test to pass with QT_FORCE_ASSERTSFriedemann Kleint2022-02-192-3/+5
| | | | | | | | | Add QT_FORCE_ASSERTS to condition with standard comment. Change-Id: If493c7cdea8164f010228a755915a211c1cf1b39 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 1af068332bd8a834ae684cfa8c586f71f7e7bd28) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert "Correct haswell function target for clang"Allan Sandfeld Jensen2022-02-191-5/+1
| | | | | | | | | | | This reverts commit 1cc0494f7dbb0731533c7d691685bb50d3e1dd1a. Reason for revert: Not a fix, but a break Change-Id: Ie41d8870dbd52f87059f6bad2335e272409c3046 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 6944b4df7bac464eaee8e03ea724db25303fdbc1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDesktopServices: make QOpenUrlHandlerRegistry a non-QObjectMarc Mutz2022-02-181-7/+5
| | | | | | | | | | | | | | | | | | | It seems to have been a QObject solely for its single slot. But since Qt 5, slots need no longer be defined on QObjects, so we can remove the inheritance from QObject now. We still need a QObject as the context object in connect(), but that can be just be an aggregated naked QObject. Saves 26 relocations, ~1.5KiB in TEXT and ~0.3KiB in DATA on optimized GCC 11.2 Linux AMD64 C++20 builds. Change-Id: Ic45a8e892ec2bd5de5de8fbd32ec7a167c501803 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 0e60e4bf199b38594defcc80de276e460273b7fe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Ensure QMainWindow has WA_TranslucentBackground when using unified toolbarTor Arne Vestbø2022-02-181-1/+8
| | | | | | | | | | | | | Otherwise the QWindow will not end up with a surface format with an alpha. This issue had been hiding in the shadows because we hard-code the backing store image format to include an alpha, but was discovered when trying to use RHI to flush the backing store, which does respect the window format. Change-Id: Ie2b28ca605fc7aa1b1ed22885c8f56e76d3a0305 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 1741034090fa462c2a7ed07490162dcacfd883b0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Windows: use QSystemLibrary instead of LoadLibrary directlyAndy Shaw2022-02-182-7/+14
| | | | | | | | | | | | | Using QSystemLibrary ensures that it will only use the expected copy of the system library and not one that has been placed in the application's working directory or elsewhere in the PATH environment variable. Change-Id: Ic4234334f73482b38ee5f06345bf11f8c029edc5 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit a14f2d59141e05d4c8e116895e918638b920611d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude autotest for INTEGRITYTatiana Borisova2022-02-181-1/+1
| | | | | | | | | | | - ICU is not supported by backend. System supports only a simple named UTC time zone implementation(see QUtcTimeZonePrivate) Task-number: QTBUG-99123 Change-Id: I4a87fc3d5484d75d55890bf88d012955e5048a0b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 8875b5a9a3c53bc13f044238c704d230f5a0a13a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* typeNameForCast: use add_pointer instead of string manipulationFabian Kosmale2022-02-182-1/+14
| | | | | | | | | | | | | | | Relying on string manipulation leads to -Wredundant-parens warnings in the best case, and to non-compiling code (when using typedefs) in the worst case. We can avoid both issues by simply generating code that uses add_pointer, which takes care of reference types (even typedef'd ones), and creates no warnings about parens (as we don't write any anymore). Fixes: QTBUG-100915 Change-Id: Ic5b1cbfda20d920d11f51beeb62e9479261d5f00 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 8079361852417f57b5db8e47994870c4c8d63e3f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QNX: Silence compiler warning by initializing variablePasi Petäjäjärvi2022-02-181-1/+1
| | | | | | | | | | | | | qtbase/src/corelib/global/qlogging.cpp: In function 'void qDefaultMessageHandler(QtMsgType, const QMessageLogContext&, const QString&)': qtbase/src/corelib/global/qlogging.cpp:1555:11: warning: 'severity' may be used uninitialized in this function [-Wmaybe-uninitialized] slog2c(NULL, QT_LOG_CODE, severity, formattedMessage.toLocal8Bit().constData()); qtbase/src/corelib/global/qlogging.cpp:1535:9: note: 'severity' was declared here int severity; Change-Id: Ic0d41a024056528cac51a88086ac7e492c94bb4a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit f1d521f0765c6bb928f3fe39f952366f956fa241) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix cross-build without qt.toolchain.cmakeJoerg Bornemann2022-02-181-3/+4
| | | | | | | | | | | | | If there's no qt.toolchain.cmake used, QT_HOST_PATH_CMAKE_DIR is not set. Use the location calculated from the Qt6HostInfo package in that case. This amends commit e044c94a61f0cd2bdea1e89be4ec3c68007f7a5c. Change-Id: I99aed8e920b8c1aa6efd8f18301cc34aca5559ca Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 006224eb17d97cf5fca641d0de9900c1c60829d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update public suffix listIevgenii Meshcheriakov2022-02-182-14451/+14277
| | | | | | | | Fixes: QTBUG-100990 Change-Id: Icfcc7882be35b85bfd8828c6950e2cf23f7ede65 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 1e468432f624642db4ca3997140431640499025d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix UI mismatch when QPrinter::setDuplexZhang Hao2022-02-183-6/+13
| | | | | | | | | | | | | | | | | | | Amends fa854f214a3c812e5548ff55d179dd07ef99053b. If user call QPrinter::setDuplex method, the QPrintDialog explicitDuplexMode value won't update. Fix this by: 1) handle device-specific default and value set in QPrinter in QCupsPrintEngine(Private) 2) handle the explicitly user-selected value in QPrintDialog(Private) Done-with: Michael Weghorn <m.weghorn@posteo.de> Fixes: QTBUG-99504 Change-Id: I1a471a8554e83aa4bec8bb95fcc95f9135b0ac8c Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 72931f492092a67c39cd7fb124d54e8752ee4933) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Sync QPrinter orientation when PageSetup Orientation selectedZhang Hao2022-02-181-0/+1
| | | | | | | | | | | | | QPrinter orientation will not effect when PageSetup Orientation selected Fix this by sync PageSetup orientation property to QPrinter. Fixes: QTBUG-100261 Change-Id: I264852ea18317308dfcfb58c880f5e8ad8d299bd Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 715ed74c89a7e6c64aa85e36682699d41c195a33) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* A11Y tests: wrap memory allocations into smart pointersIvan Solovev2022-02-171-101/+87
| | | | | | | | | | | | | | | | | | | | | | | | Some of the UI elements in the a11y tests are allocated dynamically, which means that if the test fails, the element is not destroyed properly. As a result, the "hanging" UI elements affect all the following tests, which leads to more test failures and even hangs. This patch wraps all such allocations into smart pointers, which guarantees correct destruction in case of test failure, so that other tests are not affected, and also prevents memleaks. As a drive-by: - use nullptr instead of 0 in constructors; - create some objects on stack instead of dynamically allocating memory for them; - remove some unneeded 'delete' calls for the objects that belong to QObject-hierarchy. Task-number: QTBUG-87674 Change-Id: I0dcc26990955cd7b240a689a7438880b686985b7 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit cd3e3c0dc24f5eb2c5c931b5fabec904528c4102) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Check if platform has enough RAM for hugeQImage testPasi Petäjäjärvi2022-02-171-1/+4
| | | | | | | | | | | | The hugeQImage test loads, as its name suggests, a huge image. At 2.5 GiB it's too big for the hard-coded 1 GiB limit on RAM that the QNX toolchain hard-codes when it's started in QEMU. Task-number: QTBUG-100929 Change-Id: I8e8caaff7fd1dd0e648ada5df613c793f72bcf5d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 964c964193e42dacb6e64323809e81761270b591) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qmessagehandler: force QProcess tests to log to stderrPasi Petäjäjärvi2022-02-171-0/+1
| | | | | | | | | | These tests rely on reading output sent to stderr, so make sure their output does go there. Change-Id: If62c073101c1d2e3d64f8cb2769d67f3b9fbeefb Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 17c7af722c33e7347e99906ae836ad855244a6dc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Set version for tst_qguiapplication and tst_qcoreapplicationAndreas Buhr2022-02-172-0/+8
| | | | | | | | | | | | In tst_qguiapplication and tst_qcoreapplication, the application version should be set. On Android, this is done using QT_ANDROID_VERSION_CODE. Change-Id: I6b473ad25092fb24df9400e0ab8fbb8ea4edbb6a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 4e77f5ce0a69765ae7571a8981536f8494184f87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CI: Blacklist updateFocusChainWhenChildDie for QNXPasi Petäjäjärvi2022-02-171-0/+2
| | | | | | | | | | | Tests are run for QNX in qemu similar to b2qt currently (using offscreen plugin and software rendering). So the issue is same. Task-number: QTBUG-100930 Change-Id: Ie973c6c611ac48703fd7cce53925940b80858bc8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 963d60ead41ca8f5e9f47cc127926ca77054bd49) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid file-static initialization of symbols that need @availability checkTor Arne Vestbø2022-02-171-26/+27
| | | | | | | | | | | Fixes crash in key mapper on iOS < 13.4, where the symbols are not available. Fixes: QTBUG-100518 Change-Id: I9bb1a75b17e5f0f50205b757fdb673218d7fb5e0 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 242e35e774f07a8a3b561acc658cdfeba4c20752) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Update GenericDataLocation location on iOSTor Arne Vestbø2022-02-171-1/+1
| | | | | | | | | | Now matches implementation. Fixes: QTBUG-100364 Change-Id: I1274b8b485f1a02a79b7abebc2289613958f9a76 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 13fa00519d684ddc1779845cebbd6cec552f8f1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Don't print stack trace via lldb on test failure if SIP prevents itTor Arne Vestbø2022-02-173-1/+42
| | | | | | | | | | | | | | | | If the CSR_ALLOW_UNRESTRICTED_FS bit of System Integrity Protection (SIP) is enabled lldb will fail to print a valid stack trace when launched from the crashed process, and might also resulting in hanging or crashing the parent process (Terminal e.g.): https://github.com/llvm/llvm-project/issues/53254 We detect this situation and avoid printing a stack trace if so. Change-Id: Iad8cab5fcdc545d810ca4d4e985aefc0988d0234 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 985f0e9ca5905af7791f39fddd005f0c9f8fe081) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* configure: Tie -appstore-compliant to QT_APPLE_NO_PRIVATE_APISTor Arne Vestbø2022-02-171-0/+3
| | | | | | | Change-Id: Ieb0f7398498483d5b48a16623dfc28bb6fb55f0b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2a192c5f18d7ddd8d57ba0cd2cf09b4b9c6ce826) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tests: XFAIL 4 tests in tst_QWindow on WaylandLiang Qi2022-02-171-10/+9
| | | | | | | | | | | Task-number: QTBUG-66818 Task-number: QTBUG-100887 Task-number: QTBUG-100888 Task-number: QTBUG-100889 Change-Id: I05ba11e54c115380bbbb629fcba5cdd658dd5654 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit c1b68869590a96c4d448ab3e9b7b18213ec65c0c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tests: XFAIL tst_QScreen::grabWindow() on WaylandLiang Qi2022-02-171-0/+2
| | | | | | | | Task-number: QTBUG-100792 Change-Id: I1dc257abdc34c586c4c1eda96a43ea75395b1e4a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit d55c049c7cef6b4778236c2b10b6f11411b2cf1e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tests: skip tst_QX11Info on WaylandLiang Qi2022-02-171-0/+10
| | | | | | | Change-Id: I927ee28f61719ff1b67f73dc31dfcae9b73d8329 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 760815599bc518f5a0f2d33398466867f07991b9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tests: XFAIL tst_QGuiApplication::genericPluginsAndWindowSystemEvents()Liang Qi2022-02-171-0/+2
| | | | | | | | | | on Wayland Task-number: QTBUG-100891 Change-Id: Iadf12364ded4549988ad75a9487c7e96e963a956 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ae1197fc5644c653fbc652b6008b83b5b11def85) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tests: XFAIL tst_QInputDevice::multiSeatDevices() on WaylandLiang Qi2022-02-171-0/+7
| | | | | | | | Task-number: QTBUG-100790 Change-Id: Ieec4791e4322286fedeeabacc43b9cb84ea27962 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ae9fefe3c89fd5720ccaad0687f125e32f7c3fe6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing dependency to the qvkgen tool when generating vulkan codeAlexey Edelev2022-02-161-2/+6
| | | | | | | | Fixes: QTBUG-100574 Change-Id: Ib68a3d77e5d3c9a9fc541a69a2748b94ade3ceef Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit fedd4f26ad9afb0f848ad12cf621e5a7a6208742) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct haswell function target for clangAllan Sandfeld Jensen2022-02-161-1/+5
| | | | | | | | | | | Clang uses arch names directly, and not the "arch=xxx" format of GCC. Appears we do not use this target though. Change-Id: I1d295f25fe2278c5c6bc0f617496555e28427bea Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 1cc0494f7dbb0731533c7d691685bb50d3e1dd1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Repair tst_qtreeview on AndroidAndreas Buhr2022-02-162-8/+3
| | | | | | | | | | | | | Scroll tests relied on having a small window. On Android, the window can not be smaller than the screen. This patch changes the tests so that the windows have large enough content so scrolling can happen. Fixes: QTBUG-87408 Change-Id: I26a444518fd934527089297c594673937f0ecf88 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit eb628794c7bd7118f6345aefc6ae04ef6c616c7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Repair tst_qabstractitemview in case of no cursorAndreas Buhr2022-02-162-6/+7
| | | | | | | | | | | | tst_qabstractitemview requires a movable cursor. This patch skips the test if there is no movable cursor. Fixes: QTBUG-87400 Change-Id: I4e917b2ad062ce068f23603410aa9209edb9828d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 9beca767863739b4eccd642aeff296e2138032af) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Gui: test also depends for clipboard featurePasi Petäjäjärvi2022-02-161-3/+3
| | | | | | | Change-Id: Id8684b6800bd5659991bc56f8b374ec3989ee590 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 8aba951d98484992d68266d5820f82941d4e6d10) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Activate tst_QTimeLine on AndroidAndreas Buhr2022-02-161-4/+1
| | | | | | | | Fixes: QTBUG-88137 Change-Id: I2b66eefd7733198664eaeecf9507daabb3a04e81 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 9e082faf30ba42a010c2f602f8834f1a72d342d7)
* Make Droid Sans Mono available as fixed font for all Android stylesAndreas Buhr2022-02-162-3/+5
| | | | | | | | Fixes: QTBUG-87405 Change-Id: I54ebc06c82c32acd0383ea5fedf78acce4e11977 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit d4561029621a5891f05281560178063104b8f4a2)
* Update LICENSE.QT-LICENSE-AGREEMENTJani Heikkinen2022-02-161-970/+1632
| | | | | | | | | | Newest version is 4.4 so update it in the git as well Task-number: QTBUG-98971 Change-Id: I4b5bd2852c6c2775bd285c6584eb712fd0b73db3 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io> (cherry picked from commit 58173027b374146e9de16c84b9fe83101884a360) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QHash: fix off-by-one in assertionsMårten Nordheim2022-02-161-6/+6
| | | | | | | | | | | | | Coverity-Id: 378365 Coverity-Id: 378366 Coverity-Id: 378399 Coverity-Id: 378427 Coverity-Id: 378468 Coverity-Id: 378472 Change-Id: Ib1efeacb59030b9d004320e56f560367f564d207 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit a1fb3971f222afa01583e41f4d8f0e037d2c7892)
* QStringConverter: Add missing include on WindowsMårten Nordheim2022-02-161-0/+3
| | | | | | | | | | It's relied on implicitly, which is no longer valid in dev. And may accidentally be broken in other branches. Change-Id: I2272b6914e883e20d0989a1762eb1a5c1aef4e0e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 24249c0b67a159890077be28470e4b68fa6170fc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QNetConMonitor/Win: Drop all warnings down to debugMårten Nordheim2022-02-161-19/+19
| | | | | | | | | | | | | The things they warn about are not of any serious consequence to users or end-users and there's nothing they can do about it. Adding to that, in Qt 6 it has a reduced role since QNAM::networkAccessible was removed. Fixes: QTBUG-100482 Change-Id: I178d056c513b5dbb122d5c731af602d3dc117d8e Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit a6f4a1b282924d4d5fcbf443498b990fbe1853a8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove obsolete virtual method after submodules adjustedVolker Hilsheimer2022-02-161-4/+1
| | | | | | | | | | | Amends cb27ed30f7bc58474eba991f837843eb76cbd339 after follow-up change 43fb6953fb940edfec358a2d1c01e05705712829 in Qt Svg. Task-number: QTBUG-99642 Change-Id: Ice190dc9d1bdcb08d74c86edf0028cf50266d94e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c83ab25674ea5558e06b62526f0443831f593349) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* configure.bat: Fix call without argumentsKai Köhne2022-02-161-1/+1
| | | | | | | | | | | | | | | | | | If there are no arguments, echo will print its status, and config.opt.in will contain ECHO is off. Fix this by using "echo." idiom. This amends 57ad532e75f6221 Change-Id: I1697e59f23cd28256a4a6ce357eae70e36c49d5a Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7c801ec93a90f856837c4c71f0497ac03c33b611) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Eliminate double arrow in QToolButtonAxel Spoerl2022-02-161-4/+12
| | | | | | | | | | | - InstantPopup mode is set and - application uses a stylesheet that does not apply to QToolButton Task-number: QTBUG-100401 Change-Id: Iadf752ad9280d59763f4efc1938927a9b83e6ad9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit ea0e0a865237983b484ed88447b9fc4c473e2759) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QMetaObjectBuilder: fix addProperty() recording of the property typeThiago Macieira2022-02-162-3/+5
| | | | | | | | | | | | | Issue introduced by commit 465701bb98f3c3454d15c22b8e38ab4ad8821dfc. [ChangeLog][QtCore][QMetaObjectBuilder] Fixed a bug that would cause addProperty() to use the incorrect type for the property if the property's name matched a valid type registered with QMetaType. Change-Id: Ic15405335d804bdea761fffd16d402f2c9611f30 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 8de049389610037595e3b24ed660d4855aa460ce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 17:52:49 +0000