summaryrefslogtreecommitdiffstats
path: root/src
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>
* 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-161-21/+21
|\ \
| * | Enable X11 on other platforms than just LinuxNiclas Rosenvik2021-03-161-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-165-8/+23
|\ \ \ | |_|/ |/| |
| * | Doc: Fix various documentation issuesTopi Reinio2021-03-165-8/+23
| |/ | | | | | | | | | | | | | | | | | | - 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>
* | 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>
* Merge "Add auto-test for QT_USE_PHYSICAL_DPI"Morten Johan Sørvig2021-03-152-105/+123
|\
| * 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>
* / 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>
* 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-123-0/+352
|\
| * 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>
* | 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>
* | | Merge "Avoid undefined color values in corrupt xpm image"Eirik Aavitsland2021-03-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Avoid undefined color values in corrupt xpm imageEirik Aavitsland2021-03-121-1/+1
| |/ | | | | | | | | | | | | | | Issue reported by Codechecker. Pick-to: 6.1 6.0 5.15 5.12 Change-Id: I1a5aa2203fb31e0ce3b630a11e450925aee81fb0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* / Fix QMultiHash::count(key) crashAndrei Golubev2021-03-121-0/+4
|/ | | | | | | | | | | As QMultiHash uses a pointer for the data, nullptr dereference is a thing, so check for valid d before doing anything in count() Fixes: QTBUG-91704 Pick-to: 6.0 6.1 Change-Id: Ia20440cd7bdc03cb09c77f796fb9c5b52765eac5 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge "Add setting the ICON size attribute in lineedit to the style plugin"Tang Haixiang2021-03-125-1/+12
|\
| * Add setting the ICON size attribute in lineedit to the style pluginTang Haixiang2021-03-125-1/+12
| | | | | | | | | | | | | | | | | | When the font is large enough, using PM_SmallIconSize will get a large lineedit,but the icon is very small. This is very unsightly, and the style plug-in hopes to be able to define the size of the icon by itself. Change-Id: I0e35b331301472541d3378e748dbcd074d5419a2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Merge "Remove unnecessary class member"Aleix Pol2021-03-121-1/+0
|\ \ | |/ |/|
| * Remove unnecessary class memberAleix Pol2021-03-121-1/+0
| | | | | | | | | | | | | | It's never used or accessed. It's not part of exported API. Change-Id: Ie60a560fb6f1315a53442f3c067363e651b80768 Reviewed-by: David Edmundson <davidedmundson@kde.org>
* | Revert "QPushButton: fix support of style sheet rule for text alignment"Volker Hilsheimer2021-03-111-4/+2
|/ | | | | | | | | | | | | | | | This reverts commit 6269438af95bbd988ead08829fa3bc9dc25891e8, and adds a test. This change introduced QTBUG-91735, without fixing QTBUG-86857 correctly. The code already interprets the textAlignment values from the rule, also if no icon is set. Adding the same, or some default textAlignment to the text flags if there is no icon doesn't work. Fixes: QTBUG-91735 Task-number: QTBUG-86857 Pick-to: 6.1 6.0 5.15 Change-Id: Iee07e63a40e72909275f32e1caa28b33a595f879 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Merge "Remove unreachable code"Tang Peng2021-03-111-1/+0
|\
| * Remove unreachable codeTang Peng2021-03-111-1/+0
| | | | | | | | | | | | | | | | Having a `break` after a `return` is pointless as it's never reached. Change-Id: I30877e926c006fac45681f547e97a55410f02e43 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge "Futex/Windows: add support for notifying TSan"Thiago Macieira2021-03-111-22/+24
|\ \
| * | Futex/Windows: add support for notifying TSanThiago Macieira2021-03-111-22/+24
| |/ | | | | | | | | | | | | | | | | The code was already there, just only implemented for Linux. Change-Id: Ib709fc1585f647a98d54fffd16663881b6d24d6f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Merge "QObject: remove QAbstractDeclarativeData::parentChanged"Fabian Kosmale2021-03-112-4/+0
|\ \
| * | QObject: remove QAbstractDeclarativeData::parentChangedFabian Kosmale2021-03-112-4/+0
| |/ | | | | | | | | | | | | | | The code in qtdeclarative did not do anything at all anymore. Change-Id: Idd97145cb74aeb4f43dfce2f282a765e90945073 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | QProcess/Win: implement async closing of write channelAlex Trotsenko2021-03-113-13/+8
| | | | | | | | | | | | | | | | | | Instead of blocking in QProcessPrivate::closeWriteChannel(), we can handle a pending close in _q_canWrite() slot when there is no more data to write. Change-Id: I2a30789b6099a2ec075292348ebe33a11341bca3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 23:27:28 +0000