summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MSVC: Build harfbuzz with -Zc:__cplusplus -permissive-Kai Köhne2021-03-171-0/+1
| | | | | | | | | | harfbuzz includes QtCore/qatomic.h. But the Qt headers are expected to be compiled with -Zc:__cplusplus. Change-Id: I28847844e9a00f2b7c84f0d5d7d3257eb22e2e8e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* CMake: make sure to collect Android dependencies for pluginsAssam Boudjelthia2021-03-173-42/+67
| | | | | | | | | | | | androiddeployqt relies on *-android-dependencies.xml files to know what dependencies like jar files and permissions a Qt module requires. CMake create those files under Qt prefix's lib dir but CMake was not accounting for module plugins. Fixes: QTBUG-90812 Pick-to: 6.1 6.0 Change-Id: Ib3b2e2bb237159b4851ac0f23dc75f8e56af3f7a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add nullptr checkOliver Eftevaag2021-03-161-1/+2
| | | | | | | | Adding a nullptr check before dereferencing in case q is null. Pick-to: 6.0 6.1 Change-Id: Ia440e2ed41cbaf06a5919930c2e1615bb3916ff3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge "Mention QPromise in the QFuture docs"Sona Kurazyan2021-03-161-3/+4
|\
| * Mention QPromise in the QFuture docsSona Kurazyan2021-03-161-3/+4
| | | | | | | | | | | | Pick-to: 6.1 6.0 Change-Id: I5f6930116da534dd1dea41c4724c42104de38877 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge "Enable X11 on other platforms than just Linux"Niclas Rosenvik2021-03-162-23/+27
|\ \
| * | Enable X11 on other platforms than just LinuxNiclas Rosenvik2021-03-162-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set CMake variable X11_SUPPORTED for all systems that have X11. Adjust _adjust_library_map() in util/cmake/helper.py to apply X11_SUPPORTED condition around X11 related packages instead of just LINUX. Adjust configure.cmake in src/gui based on this change. Why, because X11 is not just Linux. Change-Id: Ic3c04eaa55301d1237c7e74281eccd4f8e27e9ce Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge "Round physical dpi when calculating scale factor"Morten Johan Sørvig2021-03-161-1/+1
|\ \ \
| * | | Round physical dpi when calculating scale factorMorten Johan Sørvig2021-03-161-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (For the QT_USE_PHYSICAL_DPI use case) The physical DPI is nominally computed from the physical screen size, however when QT_USE_PHYSICAL_DPI is set that size has typically been overridden with a fake size by the user, such that the resulting DPI calculation will yield some specific integer DPI. Round this DPI value in order to arrive at a nice scale factor, e.g. 144/96 = 1.5 instead of 144.01/96 = 1.5001 Change-Id: I665394e98a818b3a8f46408f3193cac4411f458d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Merge "Doc: Fix various documentation issues"Topi Reinio2021-03-166-11/+26
|\ \ \ | |_|/ |/| |
| * | Doc: Fix various documentation issuesTopi Reinio2021-03-166-11/+26
| |/ | | | | | | | | | | | | | | | | | | - Document QIODeviceBase - Document QPointerEvent::points - Fix linking issues Task-number: QTBUG-90662 Change-Id: Ib123d5708953b22e01f95c82626b39a49fff95b2 Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* | Merge "Use QFile directly instead of via QTextStream"Edward Welbourne2021-03-162-16/+24
|\ \ | |/ |/|
| * Use QFile directly instead of via QTextStreamEdward Welbourne2021-03-161-13/+23
| | | | | | | | | | | | | | | | | | | | Follows up on a TODO comment that says QTextStream is less efficient. In any case, QFile has readLine() returning QByteArray, without conversion to QString, and the parsing is uncomplicated. Change-Id: I06e563df417692d3b6514a52a313a0ff55b0b52e Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Include minus sign in ImhFormattedNumbersOnly's available keysEdward Welbourne2021-03-161-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | UIKeyboardTypeDecimalPad only provides digits and decimal point, no minus sign, but ImhFormattedNumbersOnly is documented to provide a minus sign as well. UIKeyboardTypeNumbersAndPunctuation includes punctuation, which should cover signs as well as decimal separator, so use that - same as for ImhPreferNumbers. A little more permissive than we want here, but that's better than more restrictive ! Fixes: QTBUG-91455 Pick-to: 6.1 6.0 5.15 Change-Id: I0418946014e0a66d503e61704154fd7798a0b785 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge "rhi: metal: Remove most availability guards"Laszlo Agocs2021-03-161-81/+23
|\ \ | |/ |/|
| * rhi: metal: Remove most availability guardsLaszlo Agocs2021-03-161-81/+23
| | | | | | | | | | | | | | | | | | Once the deployment target is bumped to 13.0, most guards can be removed. Pick-to: 6.1 Change-Id: I7566a4f2915ada9defa1a4bcee10f75021222b30 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge "Fix a typo in resources_functions.prf"Tasuku Suzuki2021-03-161-1/+1
|\ \
| * | Fix a typo in resources_functions.prfTasuku Suzuki2021-03-161-1/+1
| |/ | | | | | | | | Change-Id: I38b81ba63612bd90b0a70f6b0c468667581b3c11 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge "Minor robustness improvement of text code"Eirik Aavitsland2021-03-161-2/+4
|\ \
| * | Minor robustness improvement of text codeEirik Aavitsland2021-03-161-2/+4
| |/ | | | | | | | | | | | | Fix a potential issue reported by static analysis Change-Id: I41b8eaa3c0840eec054e880c4f3298ee32685b46 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Fix tst_QPushButton tests on WaylandEskil Abrahamsen Blomfeldt2021-03-161-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tst_QPushButton::sizeHint() test was leaking top level windows and confusing the other tests, as they may end up becoming active. This also re-enables tst_QPushButton::setAccel() since I cannot reproduce the failure with that, so maybe that was related to the leaking widgets. Task-number: QTBUG-91418 Change-Id: I33f4a12bf67f784c5d6a06b2407d067e804d766f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Skip tst_QDockWidget::restoreDockWidget on WaylandEskil Abrahamsen Blomfeldt2021-03-161-0/+6
|/ | | | | | | | | | | There is something wrong with dock widget positioning on Wayland. In the interest of getting tests running at all, we skip the test for now, like we already do with a few others. Task-number: QTBUG-91418 Task-number: QTBUG-91483 Change-Id: I44f5fa0e4d0a43a46ce24a61a899bfcc03787f28 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge "Add auto-test for QT_USE_PHYSICAL_DPI"Morten Johan Sørvig2021-03-153-105/+199
|\
| * Add auto-test for QT_USE_PHYSICAL_DPIMorten Johan Sørvig2021-03-151-0/+27
| | | | | | | | | | | | | | | | Test that setting QT_USE_PHYSICAL_DPI uses physical DPI instead of logical DPI. Change-Id: I7f89cf1af5e013454cc3d8ec3559f2719514fea3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * Auto-test some high-dpi env variablesMorten Johan Sørvig2021-03-151-0/+49
| | | | | | | | | | | | | | Add auto-tests for QT_SCALE_FACTOR and QT_SCREEN_SCALE_FACTORS Change-Id: I57bffa266be910f2ba26cb1a870e09ae202fcae0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * Don’t store screen scale factors in GLOBAL_STATICMorten Johan Sørvig2021-03-152-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Use a normal static variable, like the other high-dpi variables. Clear the stored factors in initHighDpiScaling(). This makes auto-testing possible where the application object is recreated for each test case and should start with a clean slate. Change-Id: I1831c856b5d7a2c522e62c7ed0657da771c3144f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * Read high-dpi env. variables in initHighDpiScaling()Morten Johan Sørvig2021-03-152-97/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all environment access to initHighDpiScaling(), which makes it so that all environment access happens at one point in time during QGuiApplication construction. Replace the “qt.scaling” logging category with “qt.highdpi”, and log each recognized env. variable. Further logging of DPI and computed scale factors will be introduced later on. This also enables auto-testing of the environment variable settings, since the auto-test can now control when the environment is read by (re-)creating the application object. Change-Id: I4e62a9c0050438357a58ace5b50fb7c5950c87ce Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge "Port from QScopedPointer to std::unique_ptr"Volker Hilsheimer2021-03-154-6/+18
|\ \
| * | Port from QScopedPointer to std::unique_ptrVolker Hilsheimer2021-03-154-6/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | Silence compiler warnings from deprecated QScopedPointer::swap after fe9d7bf759d116f99131d14ac8b1fb44b2bc62fd. For Qt 7, both QSslCipher and QNetworkAddressEntry should be made into implicitly shared classes. Change-Id: Idfd5ec4b5a0f156f212d57684822a3cd1d88de1a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge "Code tidies"Zhang Hao2021-03-151-4/+2
|\ \
| * | Code tidiesZhang Hao2021-03-151-4/+2
| | | | | | | | | | | | | | | | | | | | | Delete the conditional judgment that must be established Change-Id: I3bd94ca7b3862ab7c46370d98bf7e6cf8c040853 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Merge "qtpaths: Fix cross compilation for windows"Martin Storsjö2021-03-151-2/+2
|\ \ \ | |_|/ |/| |
| * | qtpaths: Fix cross compilation for windowsMartin Storsjö2021-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmake target may not be named "qtpaths", but one should be using ${target_name} instead. If cross compiling, and QT_BUILD_TOOLS_WHEN_CROSSCOMPILING isn't set, the tool won't be built at all and there's no such target to set properties on, and if it isn't set, the target name is something else. Change-Id: I3d904036106b38df6e56ad35d400cf9a0bb1cbdf Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge "Fix tsts_QShortcut::keys on Wayland"Eskil Abrahamsen Blomfeldt2021-03-152-1/+8
|\ \ \ | |_|/ |/| |
| * | Fix tsts_QShortcut::keys on WaylandEskil Abrahamsen Blomfeldt2021-03-152-1/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Wayland doesn't support explicit window activation, so the qWaitForWindowActive() function won't actually wait for the window to be active. On platforms like this, we just QTRY_VERIFY() for the window activation instead. Task-number: QTBUG-91418 Change-Id: I5f728e6a6bcaac283c026b60e6378b9d5aaf1be5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Skip tst_qwindow test when running on WaylandEskil Abrahamsen Blomfeldt2021-03-151-0/+2
| | | | | | | | | | | | | | | | | | The tst_qwindow test failed with a warning that programmatically moving the mouse cursor is not possible with Wayland. Task-number: QTBUG-91418 Change-Id: I02ceb2af43fbc83a4e6ae09718315f5f79ff8285 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix tst_qwidget_window::mouseMoveWithPopup on WaylandEskil Abrahamsen Blomfeldt2021-03-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | The test assumed that a window was registered as the active one immediately when it was exposed. This created a race condition on Wayland, where we would often get the wrong active window when simulating the events. Task-number: QTBUG-91418 Change-Id: Ie41fe5adb339bbb43d5ee5db400a198e479de386 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Make tst_qwidget pass on WaylandEskil Abrahamsen Blomfeldt2021-03-151-3/+16
|/ | | | | | | | | | | | | | | | | | | | | | | | Several tests failed due to side effects of client side decorations. We explicitly disable this when initializing the test to make things go smoother. In addition, the setToolTip() test tries to set the mouse cursor position programmatically, which is not possible on Wayland. And finally, the qWaitForWindowActive() falls back to qWaitForWindowExposed() on platforms where explicit window activation is not supported. This fixes a few issues, but in cases like focusProxy(), it means we aren't actually waiting for the WindowActivation event. Instead of testing for exposed twice on such platforms (Wayland), we replicate the logic from qWaitForWindowActive() instead and rely on automatic window activation. If it fails, we do a QSKIP, so this shouldn't cause any flaky test failures at least. Task-number: QTBUG-91418 Change-Id: I767c881e7cdc91f43ad357294a2c6240ab1af43c Reviewed-by: Liang Qi <liang.qi@qt.io>
* QRandomGenerator: remove dead code previously used by qrand()Thiago Macieira2021-03-141-22/+0
| | | | | | | | | | Commit 9ee554ac1d1af97e7ad5b4bf78e2779f7d1c405f removed qrand() and qsrand(), so commit 81896304dc1fb65da3302deb54ab4cfe060625ff removed the functions accessing QRandEngine, but forgot to remove the actual engine. Pick-to: 6.1 Change-Id: I26b8286f61534f88b649fffd166c41aecf55d2b1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QSslError: port to unique_ptrGiuseppe D'Angelo2021-03-142-3/+11
| | | | | | | | | | So to avoid QScopedPointer::swap deprecation. Side note, QSslError is not implictly shared (although it should be, but that's a job for Qt 7). Change-Id: I42f7abffa81d72aac5af157074a0c3cbd20ba253 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* make qmljsDebugargumentsstring() and forceOpen() constPeng Wenhao2021-03-132-2/+2
| | | | | | | | Guessing the const specifier was accidentally forgotten Signed-off-by: Peng Wenhao <pengwenhao@uniontech.com> Change-Id: I611acc8d67d3eb101df9c8d816dd5779241a79f8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge "Move qtpaths from qttools repository to qtbase"Alexey Edelev2021-03-129-67/+565
|\
| * Move qtpaths from qttools repository to qtbaseAlexey Edelev2021-03-123-0/+352
| | | | | | | | | | | | | | | | | | qtpath should replicate the functionality of 'qmake -query'. Also we want this tool to be available in builds without qttools. Task-number: QTBUG-75870 Change-Id: I6578fc4fc45dd940fd353a5cfe6db0a12744230a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Add support for various output formats for QMakePropertyAlexey Edelev2021-03-126-67/+213
| | | | | | | | | | | | | | | | | | Add the ability to select a standard and json output formats of the Qt properties. This patch also improves the encapsulation of QMakeProperty. Change-Id: Ib1d232be1b430ed8456ce65cc98141282e4c3f7f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge "Fix QVulkanWindow on Wayland"Eskil Abrahamsen Blomfeldt2021-03-121-1/+1
|\ \
| * | Fix QVulkanWindow on WaylandEskil Abrahamsen Blomfeldt2021-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Wayland backend needs 4 buffers and is failing when making QVulkanWindow since there was a hardcoded limit at 3. The Vulkan-backend to RHI already has smarter handling of this. We want to limit the changes we do to the "legacy" QVulkanWindow, so we keep the hardcoded max value but increase it to 4 to accommodate the requirements on Wayland. Task-number: QTBUG-91418 Change-Id: I830bc30d1c2eeac1b076c50d35d5d138fd46dace Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Merge "Remove “scaling” logging from QBackingStore"Morten Johan Sørvig2021-03-121-4/+0
|\ \ \
| * | | Remove “scaling” logging from QBackingStoreMorten Johan Sørvig2021-03-121-4/+0
| |/ / | | | | | | | | | | | | | | | | | | Prepare for renaming the logging category. Change-Id: I1fefefa510032ca70754fde9d80f9ac35ffa977b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Merge "Support additional gbm surface flags"Elvis Lee2021-03-122-2/+4
|\ \ \ | |_|/ |/| |
| * | Support additional gbm surface flagsElvis Lee2021-03-122-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Some vendor requires more gbm surface flags for specific purpose, such as protected content. Change-Id: Ie7db337e05f941b5480ffaccf61fbc94eb989ffc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 11:54:48 +0000