summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QTest: remove unneeded cast in toPrettyUnicode()Marc Mutz2021-07-071-2/+2
| | | | | | | | char16_t, as returned from QStringView::utf16(), is guaranteed to be unsigned, so there's no need to reinterpret_cast to ushort. Change-Id: I7432dd26b4814c61fe70cc33ed307097ef46ce4e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* .gitignore: Ignore __pycache__ directoriesIevgenii Meshcheriakov2021-07-071-0/+1
| | | | | | | Ignore cache directories created by Python 3. Change-Id: Ie1721de8c85a2d4f7e37ec434beba9e53e2d21a1 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* tst_QCryptographicHash: simplify the creation of a large QBAMarc Mutz2021-07-071-4/+1
| | | | | | | | | Use the ctor instead of appending 1'000'000 chars. Introduce C++14 digit separators as a drive-by. Change-Id: Icdbef3173f42d12ae2226b8556f9b1519e594adc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QLocalSocket/Win: fix typo in function nameAlex Trotsenko2021-07-071-3/+3
| | | | | | | Amends b3fbfcd3738a0ff864439499390513b95ca671aa. Change-Id: If6557f851324cdbb89af6c89e7b792a777d2dedd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* Fix platform definition directory in top-level buildAlexey Edelev2021-07-071-1/+1
| | | | | | | | | | | | | | QT_BUILD_DIR should be used instead of CMAKE_BINARY_DIR as a base directory for platform definition when building a non-prefixed build since artifacts are copied to qtbase directory for top-level build. Amends 478f5fcde66a49b710c427447916a0ee0e4d9e0a Pick-to: 6.1 6.2 Task-number: QTBUG-94973 Change-Id: I5cce16fdc7f760b954222ae67a4b85d4beea7f13 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QProperty: Downgrade assert in noSelfDependencies to warningFabian Kosmale2021-07-072-1/+13
| | | | | | | | | | | | | | | We call evaluateRecursive_inline in setBinding, which in turns runs the noSelfDependecies check. However, creating a binding resuting in a binding loop must not crash, but instead result in the binding entering an error state. To prevent a crash caused by the assert in debug builds of Qt, we replace the assert with a warning for now. A better approach in the future would be to ensure that we only run the check in cases where we are sure that a self-dependency is really a fatal error. Pick-to: 6.2 Change-Id: I58158864ed81fa907132a4e7d6667c9b529e7e64 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
* Doc: Fix documentation warnings for QRgbaFloatTopi Reinio2021-07-071-4/+10
| | | | | | Pick-to: 6.2 Change-Id: I0c11edd184c7536ef91498d191a4a8684083f48a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* QTest: there's no toString(QImage)Marc Mutz2021-07-071-1/+1
| | | | | | | | | | | ... so don't try to call it. The call resolves to a fall-back implementation of toString() that just returns nullptr, so we might as well pass nullptr directly, like three lines above, and not confuse readers of the code. Change-Id: I85d196aae7a0317050cfe16b206252df3fdffa2d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-077-8/+7
| | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. Pick-to: 6.2 Task-number: QTBUG-90819 Change-Id: Ibc7c2bcd3b6a9dc77df40c4c0c22ff254a80f33d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix typo in function nameCraig Scott2021-07-072-3/+3
| | | | | | Pick-to: 6.2 Change-Id: I72ab657670ca6fa460b3495f85d6edd920ee2c8a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qSwap: make it constexprGiuseppe D'Angelo2021-07-071-1/+1
| | | | | | | | | | | C++20 gave us constexpr std::swap, but it makes no sense for qSwap not to be constexpr anyways. [ChangeLog][QtCore][QtGlobal] qSwap is now constexpr. Change-Id: I13f3cbf2870adf5770c62dc00e15004978fc85d9 Pick-to: 6.2 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Fix placement of placeholder text in QLineEdits with action iconsVolker Hilsheimer2021-07-063-5/+75
| | | | | | | | | | | | | | | | | | | | After dc794f7622bc00f7ca50fab65d6965695d6d2972, side widgets only got space if they were not fading out, but the logic was not correctly accounting for side widgets that never fade, such as buttons added via QLineEdit::addAction. Fix this to give visible widgets space, unless they are fading out. That was the intent of the original change. Rename the variable to make its purpose clearer, and reset it at the end of the fade-out animation. Add a much-needed test that relies on private APIs to verify that the effective margins are calculated correctly. Fixes: QTBUG-94824 Pick-to: 6.2 6.1 5.15 Change-Id: If2ee6be52be9e4f9be1e91f72f27681ce27def6d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QCryptographicHash: don't allocate a Private in hash()Marc Mutz2021-07-061-2/+2
| | | | | | | | | Just create it on the stack, we know the lifetime. Reduces memory allocations in static hash() from 2 to 1. Change-Id: Ie0e22b023331da9a6f39c80b4cd1a5c016f63a87 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QCryptographicHash: move salient API to Private classMarc Mutz2021-07-061-149/+168
| | | | | | | This is in preparation of an optimization in hash(). Change-Id: I2883dd6e9285f71bc7fed699a8a04645d621d4f5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QJsonValue: add rvalue overloads for QJsonArray and QJsonObject ctorsMarc Mutz2021-07-065-0/+45
| | | | | | | | | | | | | | | | | | These can be noexcept. Requires to add rvalue overloads for QCborMap::fromJsonObject() and QCborArray::fromJsonArray(), too. [ChangeLog][QtCore][QJsonValue] Added constructors taking rvalue QJsonArray and rvalue QJsonObject. [ChangeLog][QtCore][QCborMap] Added rvalue overload of fromJsonObject(). [ChangeLog][QtCore][QCborArray] Added rvalue overload of fromJsonArray(). Change-Id: I523c9a41166ea932fba4dd204072bd39d2192d2e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qlocalexml2cpp.py: Remove undefined name inside error processing codeIevgenii Meshcheriakov2021-07-061-1/+1
| | | | | | | | | | Name 'stem' is undefined inside CalendarDataWriter.write(). The error was repoted by flake8. Task-number: QTBUG-83488 Pick-to: 6.2 Change-Id: Ib816b40d0bde2afd3112da76deee0ce39985693a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fix QStringEncoder code exampleNicolas Fella2021-07-061-1/+1
| | | | | | | | Make sure the right variable is used Pick-to: 6.2 Change-Id: Iec6d8392b320b704423ecbd4434270883fa9fd96 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix memory leaks in tst_qlineeditAndreas Buhr2021-07-061-2/+2
| | | | | | | | | | | | In the unit tests, two times a validator was used without a parent, which led to memory leaks. This patch changes this: The validators are initialized with the widget they are meant for as parent. This fixes the memory leaks. Pick-to: 6.2 Change-Id: I480c0c5104cbe60159fad49df28cbb6240e7ce68 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
* macOS 10.15: Fix focus frame for combo boxesVolker Hilsheimer2021-07-061-0/+2
| | | | | | | | | | | | | | Amends df316963213e765de5b94469622df48b0c9a9e6e to take care of macOS 10.15 specifically, where the focus ring is a pixel too high and leaves a gap that's visible on high-dpi displays. On macOS 10.14 and before, and for editable comboboxes, the focus frame is correct. Fixes: QTBUG-94069 Pick-to: 6.2 6.1 5.15 Change-Id: I278aa30036808c06f8e71385d4797315e46d8f1d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* QCryptographicHash: extract a constexpr hashLengthInternalMarc Mutz2021-07-061-46/+51
| | | | | | | | | | | ...and use it internally. Exported symbols are LD_PRELOADable, so the compiler might not constant-fold calls to them. Besides, it's a requirement for a follow-up change. Change-Id: I437f46d7d42ed0a6921dee3027a471e2aa52baa1 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* QCryptographicHash: make Private::method constMarc Mutz2021-07-061-3/+7
| | | | | | | It never changes, making it const might improve code-gen. Change-Id: Ife8723e27ae9cf6cfcca48d58d46307003123354 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QLocalSocket: reimplement readLineData() functionAlex Trotsenko2021-07-067-9/+76
| | | | | | | | The base implementation reads data using repeated calls to getChar(), which is quite slow. Change-Id: Ie46624df63791b2cdd3c8a28fe3327427d942505 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* Restore default installation prefix from Qt 5Joerg Bornemann2021-07-061-6/+17
| | | | | | | | | | | | | | | | | Change the default installation prefix to C:/Qt/Qt-${version} on Windows and /usr/local/Qt-${version} elsewhere. This is what's expected by users coming from Qt5, and setting the installation prefix to "/usr/local" manually is easier than setting the versioned variant "/usr/local/Qt-6.2.0". [ChangeLog][Build System] The installation prefix now defaults to /usr/local/Qt-${version} and C:/Qt/Qt-${version} like it did in Qt 5. Fixes: QTBUG-91632 Pick-to: 6.2 Change-Id: I8ce57b1b18084c705b194c776e038cc807a6ed5e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* configure: Add summary for xcb-sm (X11 Session Management)Friedemann Kleint2021-07-061-0/+1
| | | | | | | Pick-to: 6.2 6.1 Task-number: QTBUG-95004 Change-Id: Idf1d47558427b35a7a325379884672553c99edc6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QCryptographicHash: port addData() to QByteArrayViewMarc Mutz2021-07-067-33/+128
| | | | | | | | | | | | | Incl. the static hash() function. Remove the QByteArray versions from the API, but not the ABI. Adapt some callers. [ChangeLog][QtCore][QCryptographicHash] Replaced QByteArray with QByteArrayView in addData() and static hash() functions. Change-Id: Ia0e9bf726276305e05894d323d76a29e985f39eb Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* opengl: fix a typo in QOpenGLPaintDevice::dotsPerMeterY()Liang Qi2021-07-061-1/+1
| | | | | | | Fixes: QTBUG-95005 Pick-to: 6.2 6.1 5.15 5.12 Change-Id: I88ab9b757a5cfee520e07ac6280e31f9211342f0 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* The build for INTEGRITY is static only so libdl.a is not neededTatiana Borisova2021-07-061-2/+2
| | | | | | Pick-to: 6.2 Change-Id: I8e81d00a0be2521e42db98d3b687b8e1471753e9 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Exclude 'global' headers from QT_BEGIN_NAMESPACE check in syncqt.plAlexey Edelev2021-07-061-1/+2
| | | | | | | | | | | | | Add 'global' headers to the ignore list of the QT_BEGIN_NAMESPACE check. The QT_BEGIN/END_NAMESPACE use in some of global header files makes no sense. This will suppress warnings caused by migration to the generated cpp exports. Amends b10e4e846e7b1a7b4c9c7cb7b4ef1081e22f2354 Task-number: QTBUG-90492 Change-Id: Ic7e3f284263740021f86cade4dc19d810cb8fe02 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* locale_database: Sort lists of unused tags before printingIevgenii Meshcheriakov2021-07-061-1/+1
| | | | | | | | | This way the output is easier to compare between versions. Task-number: QTBUG-83488 Pick-to: 6.2 Change-Id: If4053c574c4ad200a179b06276bd889f2cb9e1c6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* locale_data: Add new line at the end of script outputIevgenii Meshcheriakov2021-07-061-1/+1
| | | | | | | | | Output of cldr2qlocalexml.py looks weird without the final new line. Task-number: QTBUG-83488 Pick-to: 6.2 Change-Id: I5d675e475c57cdc8101887c39052007ba0a19857 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* QFile benchmark: always use Unbuffered for QFSFileEngine testsEdward Welbourne2021-07-061-7/+5
| | | | | | | | | | Support for buffered usage with QFSFileEngine was dropped in 5.10; trying to use it triggers an assert. Task-number: QTBUG-91713 Pick-to: 5.15 6.1 6.2 Change-Id: I5f46e9f793310538344b96bf2efbeba34098de83 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix QDirIterator benchmark to actually find its test dataEdward Welbourne2021-07-061-15/+13
| | | | | | | | | | | | | | | | | The benchmark had a hard-coded path on MS and needed an environment variable set otherwise; neither sounds like a good approach, when testlib defines a variable that tells us the test's source directory, a clearly superior way to find things in our source directories. In the process, replace exit()ing on failure to get a path with a QSKIP() so that the test at least fails gracefully if it ever can't find its data. (Using QFAIL() left it with no rows but still trying to run the test, leading to an assert failure.) Pick-to: 6.2 6.1 5.15 Task-number: QTBUG-91713 Change-Id: I1bd5561971239bb838bcf6c24bcdf1d07c81a657 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Clarify readLine() behavior on sequential devicesAlex Trotsenko2021-07-062-1/+108
| | | | | | | | | | QIODevice::readLine() can also return partial lines, which was not properly documented. Add an autotest for QLocalSocket to illustrate and test this behavior. Pick-to: 6.2 Change-Id: Ia2c1c438cc68d2672d34881e11fdf7837232f3b4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* Remove unsupported host-related configure optionsJoerg Bornemann2021-07-065-26/+0
| | | | | | | | | | | | | The following host-related configure options were unsupported since Qt 6.0 and are now completely removed: -hostprefix -external-hostbindir -host*dir (except -hostdatadir) -android-ndk-host Pick-to: 6.2 Change-Id: Ib69d90c40ef546f61bf87b1f443eb9d10f7a5a21 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove outdated information from configure-cmake-mapping.mdJoerg Bornemann2021-07-061-2/+0
| | | | | | Pick-to: 6.2 Change-Id: I5101a3d7d07e4c0e818fb005707d99c6afe8f589 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QCryptographicHash: don't present the same data over and over againMarc Mutz2021-07-062-3/+85
| | | | | | | | | | | | | | | | | | Need to decrement 'remaining' (check), but also increment data (meep). Testing is a bit complicated, as most algorithms are just too slow to fit into the 5min QTestLib timeout. Picked the fast ones and Sha512 (which completes here in < 17s, with threads), at least. Amends e12577b56396cca0df05f88f8787706a3a12c82d. [ChangeLog][QtCore][QCryptographicHash] Fixed a bug where presenting more than 4GiB in a single addData() call would calculate the wrong result(). Pick-to: 6.1 6.2 Change-Id: Ic72916ebc33ba087d58225af6d8240e46e41f434 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* macOS: fix separator actions not showing in menusVolker Hilsheimer2021-07-051-14/+9
| | | | | | | | | | | | | | | | | Amends a3f3af8a8fb8f8b09d1685df5ab836244f850a62, which resulted in the last visible separator always getting hidden. Don't abuse QCocoaMenuItem::visible property to store whether the native NSMenuItem is shown, only store whether it should be shown. Rename the local variables to simplify the logic. Fixes: QTBUG-94802 Pick-to: 5.15 6.2 6.1 Change-Id: I56e8c99a2a46d8cbdf75c4ad6cb714961f28a6a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix the detection of platform definitions directoryAlexey Edelev2021-07-052-26/+34
| | | | | | | | | | | | | | | | | | Platform definition directory is defined when building qtbase. Depending on the build type (prefixed/non-prefixed) it should point: - To the source directory when building prefixed qtbase. - To the installation directory of the prefixed qtbase when building consumer projects. - To the build directory of non-prefixed qtbase when building non-prefixed qtbase or consumer projects. TODO: It is desirable to move the logic asssociated with Qt platform definition to the qt_internal_setup_public_platform_target function. Pick-to: 6.1 6.2 Fixes: QTBUG-94973 Change-Id: I8530613f9b2029834c66206bbdf02475528a4640 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* tst_QCryptographicHash: make hashLength() data-drivenMarc Mutz2021-07-051-3/+12
| | | | | | | Pick-to: 6.1 6.2 Change-Id: I44bf73e15b53b8d93d116f4114bc667c4c94b7b4 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Show positions in QDebug operator<<(dbg, QHoverEvent*)Shawn Rutledge2021-07-051-19/+30
| | | | | | | | | | In Qt 6, QHoverEvent is a QSinglePointEvent and carries more information than it did in Qt 5. Task-number: QTBUG-94971 Change-Id: I55b271e8741081ed9074f687b08f4111142a1bf0 Pick-to: 6.2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* dateconverter.py: Remove shebang and executable attributeIevgenii Meshcheriakov2021-07-051-1/+0
| | | | | | | | | | | This is not a script that can be run independently. Task-number: QTBUG-83488 Pick-to: 6.2 Change-Id: I82a93b9ab37ae759b789058d48e94298ecd29b6f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Repolish child widgets when parent style sheet changesVolker Hilsheimer2021-07-052-1/+24
| | | | | | | | | | | | | | | | | | | If a child widget that is affected by the parent's style sheet is polished (because it's been shown explicitly, for instance by a layout), then it must be repolished when the parent's style sheet changes, even if the parent itself has not been polished yet. Since the style sheet is set on the parent widget, we must repolish the parent (which will repolish the entire widget tree), not just the individual children and grand children. Fixes: QTBUG-76945 Task-number: QTBUG-39427 Task-number: QTBUG-18958 Change-Id: I7bca9ee1badc07202fa05dc97f440f4ca6c9517d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Add high-resolution pixmaps for macOS dock widget title iconsVolker Hilsheimer2021-07-0522-8/+28
| | | | | | | | | | | The macOS style falls back to the QCommonStyle for those, and that style loads the macstyle pixmaps. Weird, but cleaning that up is for another commit. Fixes: QTBUG-38776 Pick-to: 6.1 6.2 5.15 Change-Id: Ie1fe721387e64cb91ee5fc528667a63e6ddd6eed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Make Android detection more robustJoerg Bornemann2021-07-051-11/+22
| | | | | | | | | | | | | | | | | | Our only way to detect whether the user requests an Android build of Qt was to peek into the CMake toolchain file if it is specified. If the toolchain file contains a certain magic string, we decide that we're building for Android. This approach is fragile and bound to break should the Android toolchain file's magic string ever change. Now, we assume an Android build if any of our ANDROID_* cache variables is set. In that case, we do not peek into the toolchain file. Pick-to: 6.2 Fixes: QTBUG-94955 Change-Id: Ie2f0ac0963f90f09805e311111bb6912d4325ada Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix qt6_extract_metatypes to work with VS GeneratorsAlexandru Croitor2021-07-051-0/+26
| | | | | | | | | | | | | | | | CMake has an optimization where it skips creation of a ${target}_autogen target and instead uses PRE_BUILD events for AUTOMOC. That breaks qt6_extract_metatypes which expects the autogen target to always exist. Disable the optimization by generating a dummy header file and adding it as a source to the target. Pick-to: 6.2 Fixes: QTBUG-94944 Change-Id: Ic3d923cc6d3a149fea8c5c7b111576b64d19f608 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Rename QRgbaF to QRgbaFloat and assert the compatible typesAllan Sandfeld Jensen2021-07-0514-487/+503
| | | | | | | Pick-to: 6.2 Change-Id: I2404fdfd43d3b4553760ad2f605175121cd31446 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix binding functor addressing in QPropertyAndrei Golubev2021-07-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | We create the callable object at sizeof(QPBP) offset from the beginning of the memory block. However, evaluateRecursive() uses sizeof() + alignment when fetching that same callable from the memory While on 64-bit platforms this is fine due to sizeof(QPBP) == QPBP::getSizeEnsuringAlignment(), this is broken for 32-bit systems where there's actually alignment bits that follow the QPBP struct in memory (and thus we cast a random memory location to an object) (Note: QPBP is short for QPropertyBindingPrivate) To fix this, change the offset for creation and destruction of the callable to the one that uses alignment. This way, evaluateRecursive() code becomes correct Fixes: QTBUG-93890 Pick-to: 6.1 6.2 Change-Id: Ief57051846632fa61df4b79b3f054c25062a9498 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Run tst_QIODevice::skip() on random-access deviceAlex Trotsenko2021-07-031-3/+4
| | | | | | | | Due to mistake in data it was missed for testing. Pick-to: 6.2 Change-Id: I4dcd6fd90fd501e4cc941c07efcf9439ba6acf30 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* Fix rvalue overload of qobject_pointer_cast for GCC 9.3Marc Mutz2021-07-031-5/+1
| | | | | | | | | | | | | | | The code assumed that any C++ implementation would implement the resolution for LWG2996 in C++20 mode. While that may be the case in the future, the current state in GCC 9.3 as shipped in Ubuntu 20.04 LTS is that it doesn't, which leads to tst_qsharedpointer fail there. Fix by using the safe version of std::move, std::exchange, which guarantees the state of the src object, no matter what the callee does. Pick-to: 6.2 6.1 5.15 Change-Id: Icc39b527df4d3a7b398ff2b44bcbdf9082b81f2f Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* macOS: Notify socket notifier on connection errorMorten Johan Sørvig2021-07-021-3/+11
| | | | | | | | | | | | | Enable kCFSocketConnectCallBack to get connection made/failed notifications. For the error case, the data pointer will be set (it points to an int with the error code). Change-Id: Ib51c0ae7c2c74d7bc2fea3c8b7aa9033a860f602 Pick-to: 6.1 6.0 5.15 Fixes: QTBUG-91619 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 13:32:13 +0000