summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "qdbusxml2cpp: invert Q_DECL_DEPRECATED and inline in the output"v6.5.06.5.0Fabian Kosmale2023-03-252-56/+5
| | | | | | | | | | This reverts commit 310f6666150f18d40630b54cf5c9424e4cfb5567. Reason for revert: Causes a fail-to-build regression Task-number: QTBUG-111330 Change-Id: I08a6a68d2c81e1a1189356aa7cf36aaf24fd8c9b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QVariant: ensure the type custom is registered on constructionThiago Macieira2023-03-242-0/+11
| | | | | | | | | | | | | | | I must have broken this in the 6.5 work I did for QMetaType and QVariant, but I haven't searched which commit exactly did it. Our QVariant tests are old and thus only checked the type ID, which meant that they caused the registration by the act of asking for the ID in the first place; this commit adds a couple of explicit checks for the type registered by name before the ID. Fixes: QTBUG-112205 Change-Id: Idd5e1bb52be047d7b4fffffd174f1b14d90fd7a3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 8570e86fff183ffa4c1dff577c7fa14e3342daee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* docs: Remove map and runfunction exampleDennis Oberst2023-03-231-2/+0
| | | | | | | | | | amends: fbb470b40b2c86a55751bf3099cc0424f66c7274 amends: de5e0422ca14ad1bc042889fa68772bf6912a215 Change-Id: I04d4a60f7e5f7f0d149667d0e78ca56bac23280d Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 11df026ea199c71b1e24c36dc0a6b7468288ce98) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QSQL/ODBC: fix regression (trailing NUL)Marc Mutz2023-03-231-2/+4
| | | | | | | | | | | | | | | | | | | | | When we fixed the callers of toSQLTCHAR() to use the result's size() instead of the input's (which differ, if sizeof(SQLTCHAR) != 2), we exposed callers to the append(0), which changes the size() of the result QVLA. Callers that don't rely on NUL-termination (all?) now saw an additional training NUL. Fix by not NUL-terminating, and changing the only user of SQL_NTS to use an explicit length. Amends 4c445ef0bae8b36ec4a742552f0ebd81a1a90723 and 46af1fe49f7f419dc1b3231de9860e2da0ea48f8. Done-with: Christian Ehrlicher <ch.ehrlicher@gmx.de> Change-Id: I6210b77e9417f46294df94cb32ab4134af8dc4c2 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 9020034b3b6a3a8118e5959beed699bb8aaa3f95) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* wasm: Text input hotfixMikolaj Boc2023-03-231-0/+4
| | | | | | | | | Focus the canvas on window activation to make the screen receive key events. Fixes: QTBUG-111848 Change-Id: Iad3474681653b176eebd901aaf59e84538681351 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Example: rename progressdialog to primecounter and modernize itDennis Oberst2023-03-2115-86/+494
| | | | | | | | | | | | | | The previous example finished way too quickly and provided no real value in regards to API understanding. Previously, QtConcurrent::map was used, which was also used in other examples. We are now using QtConcurrent::filterReduce to demonstrate other functionality. Task-number: QTBUG-111165 Change-Id: Ibd6eb119d0711cddfe8b211d460e9d67d6ce95c3 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 8352756d27e5657390b6e87f45e0c0bae6b7784e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Example: update wordcount exampleDennis Oberst2023-03-213-64/+127
| | | | | | | | | | | | | | | Added a QFileDialog to let the user select a path. Before, the path was statically assigned with "../../" , which is not optimal. I also modified the findFiles function to check for text files in general and not only *.cpp and *.h files. Lastly the result of the word counting is now displayed on the console, as I think this is an informative output from this example. Task-number: QTBUG-111165 Change-Id: Ie27c6acb4f79a78e3bef141edb92de08901fde71 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit d795dfaee7093a30b278e6e8b9dea30c2e7a2106) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix FTBFS with -qtnamespaceMårten Nordheim2023-03-191-1/+3
| | | | | | | | | | | | | qtbase/src/corelib/kernel/qvariant.h(54): error C2888: 'const bool qIsRelocatable<qt::QVariant>': symbol cannot be defined within namespace 'qt' Amends 0ca803a5d325f26f5e4e0fcab8b9c9a02f154336 Fixes: QTBUG-112016 Change-Id: I43b3f292fa85b6cda00f36da6c8aff65da4ed742 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit c0a732f984f407f7613805ff04b8a6d46c12f754)
* SQLite: Update SQLite to v3.41.1Christian Ehrlicher2023-03-193-39/+92
| | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.41.1 Change-Id: Ibc88ae7b73ea46797d7aff00ee193b1ccfaae31b Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 17e4b2d8ed8fc6c05e9ce66d39f0eff5a768cbd6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Example: update imagescaling exampleDennis Oberst2023-03-175-15/+18
| | | | | | | | | | | | Updated the example to align with the Qt6 Example-Guideline. https://wiki.qt.io/Qt6/Example-Guideline Task-number: QTBUG-111165 Change-Id: Ibd9e7ce0d4dee90f6a693b81516d2f5b86345b1d Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit b5e9d418959a9d427c14468886470791527e157f) Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* androiddeployqt: remove infinity loop in deleteMissingFilesBartlomiej Moskal2023-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a possibility of infinite loop and eventually crash when androiddeployqt was used for the second time. Everything because of deleteMissingFiles function for clean up previous build. When we find the same names and those are directories, we call recursively deleteMissingFiles. The parameters we use are absoluteDir, not absoluteFilePath. As we use parent of found dir, deleteMissingFiles is called with the same values as before. This commit removes possibility of infinite loop by using absoluteFilePath. That allows to avoid calling deleteMissingFiles with the same parameters. There is still a possibility, that directory that was found is not the same as we were looking for. That will cause not needed files removing, but those file will be copied again later. This regression was created by 7dc05252a0df829bb5ea3994160d425bb0da26cb commit Fixes: QTBUG-111027 Change-Id: I195b4c407068b14e2ef94800ad1945adc66408cb Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit f4d897f04eee6386382096945f872ae9f306a5de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit b0553d15a06c9a842e82caf8ce62530bd45d888c) Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Doc: Remove broken link to Anchor Layout Examplev6.5.0-rc1Andreas Eliasson2023-03-131-2/+0
| | | | | | | | | | This example was moved to manual tests in 6.5, which broke the link. Now that it's in manual tests, I guess we can stop promoting it. Change-Id: I1aa4a7de5123e96bf9ff56eeae49104acdce9645 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 9f93f96394fd4ab209ba45cd99753b9c7edcf373) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Imagescaling example: fix memory leaksIvan Solovev2023-03-131-1/+2
| | | | | | | | | | | | | | * The DownloadDialog was never destroyed properly. Pass 'this' to its constructor to fix it. * When re-creating an image grid layout, properly clean up old image labels in Images::initLayout() Task-number: QTBUG-103514 Change-Id: Ief52774002632d4ad3a6cca85bb0c0aa1a1d4bc0 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 0ac234f9e256949cbacb77f94d39fff90caba7b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QMetaType: Ensure that qfloat16 gets correct idFabian Kosmale2023-03-131-0/+14
| | | | | | | | | | | | | | | | | | Code initially compiled against Qt <= 6.2 does not have a qfloat16 metatype that unconditionally gets registeret from QtBase. Therefore, any preexisting metatype instance for qfloat16 will hit the custom type registry code path. As builtin metatypes are not part of the custom registry, we will create a new type-id, and the type will thus not compare equal to new code using the builtin type-id. Avoid this issue by inserting an alias to the type in QMetaTypeCustomRegistry's constructor. Pick-to: 6.5 dev Change-Id: I825265ad16e274c08b2c4a3a4814475b6c6c6187 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Fix listed files for sha3_keccakKai Köhne2023-03-131-1/+1
| | | | | | | | | | | | JSON allows duplicated fields, but the last one will prevail. Therefore move the new "comment" before the actual list of files. Amends fa4b7495b741c3e7943860c5ff15212afceda710. Change-Id: I06874745c8c51e55d79d7a373236cc8d9151079d Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit d4dba80863324302f9d5d26b184352845263adc3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QVariant: fix comparisons between strings and integer 0Giuseppe D'Angelo2023-03-102-1/+28
| | | | | | | | | | | | | | | | | | | | | | | 250ca8d5f8bb3771695ae8eccb8d9b469003d840 changed the qConvertToNumber to have a std::optional return instead of a boolean out-argument. In doing so a code path that was supposed to report a failure (string could not be converted to an integer) accidentally starting reporting success (and converting the string to 0). The problem is that the `ok` check from QString::toLongLong was accidentally dropped in the refactoring; previously the function set `ok` to false and returned 0, now the function just returns 0. Instead, amend that return to return nullopt (because the conversion has failed). Change-Id: Iaedef5463f3ec500a97bd4c9bbddf977f66df61a Fixes: QTBUG-111867 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit a25644aecf056b9b021189de5384519b6f06c1e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make it possible to use QObjectPrivate::connect in private codeVolker Hilsheimer2023-03-103-4/+24
| | | | | | | | | | | | | | | | | | | | | In most QObjectPrivate-subclasses, the Q_DECLARE_PUBLIC macro is used in the private segment of the class declaration. In that case, the q_ptr becomes a private member of the private class, and then the QObjectPrivate::connect function can no longer be used, as it needs to access the d_ptr. Fix this by declaring QObjectPrivate, and the static-assert-helper, as friends of the class using the Q_DECLARE_PUBLIC macro. Adapt the QObject test by moving the Q_DECLARE_PUBLIC macro into the private section of the test-private, and add a compile test. Change-Id: Ifc04be3b305221e138b1e08bb3a3838d871f4fcb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 4f02973e2f447dfc92234ec247d7157ea0e1e807) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix overflow in SHA-3/KeccakMårten Nordheim2023-03-104-2/+64
| | | | | | | | | | | | | state->rate is always larger than or equal to state->bitsInQueue; when bitsInQueue == rate the queue is consumed and bitsInQueue is set to 0 again. Done-with: Marc Mutz <marc.mutz@qt.io> Change-Id: I56d268a19fb3cd542cc027edc962253f09d97a14 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit fa4b7495b741c3e7943860c5ff15212afceda710) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: fix more links to cmake functionsVolker Hilsheimer2023-03-104-9/+11
| | | | | | | | | | Use qt6_ consistently as the link target, and qt_ when referring to the function. Change-Id: I9bb903cd2c32dcded1ee7a2804aa36074e8a5c38 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 454dafb0e1a36ef6bbe9eafc240c22f6cd14e312) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QTypeInfo: move helpers in QtPrivate namespaceGiuseppe D'Angelo2023-03-102-5/+9
| | | | | | | | | | qIsRelocatable and qIsValueInitializationBitwiseZero are not public API, hide them away. Change-Id: Ib4eeaab46d01759098e96091b700e9a28fd50962 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 0ca803a5d325f26f5e4e0fcab8b9c9a02f154336) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_QCryptographicHash: Extract Method ensureLargeData()Marc Mutz2023-03-101-1/+11
| | | | | | | | | ... to make large data usable from other test functions. Change-Id: I302070121a8bb49f373c7711bc3ab9e6418874ef Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit f7ea9b36b7c56bb288f3ea55f587d2ccb8a9b7fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Example: remove map exampleDennis Oberst2023-03-106-100/+1
| | | | | | | | | | | | | | This example only demonstrates the use of blockingMapped. Considering that the QtConcurrent::mapped~ functions are already included in the wordcount example, and have very similar APIs to the QtConcurrent::filter~ functions, which are included in the progressdialog example, this no longer serves a useful purpose. Task-number: QTBUG-111165 Change-Id: Ibc526e1a9fb17070e376e45151e9c2bdbc69bd32 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit fbb470b40b2c86a55751bf3099cc0424f66c7274) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make compare(QU8SV) a non-template, document itMarc Mutz2023-03-105-26/+75
| | | | | | | | | | | | | | | | | Templates have different overload characteristics from normal functions, and treating q_no_char8_t and q_has_char8_t::QUtf8StingView separately is never necessary, as one implicitly converts into the other. Add docs for the new UTF-8 compare() functions. Amends b977ae371a753a82e1d0bb32c5b62099da663721. Found in API review. Change-Id: I58b4b28a3eccde1976d71cfa3412b734d46f314d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit bbb9cf225fd030a87818cb867c24ab651f797100)
* Example: remove runfunction exampleDennis Oberst2023-03-106-81/+0
| | | | | | | | | | | | | | | This example shows how to use QtConcurrent::run by calling a global function and printing the thread ID. As the documentation already explains the functionality very well, I don't think this example is necessary. https://doc.qt.io/qt-6/qtconcurrentrun.html Task-number: QTBUG-111165 Change-Id: I42a718cdaabdaeeab39b933d12c67d11978c95da Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit de5e0422ca14ad1bc042889fa68772bf6912a215) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QCborValue: add missing Q_DECLARE_OPERATORS_FOR_FLAGSThiago Macieira2023-03-091-0/+2
| | | | | | | | Change-Id: Ib1d2fc7100134f7597cdfffd174a650ccda287ea Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 06f60b24e23a9aa6640608f6010137ed75e2841e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Update docs to reflect method being renamedAndreas Eliasson2023-03-092-4/+4
| | | | | | | | | | The new method has been renamed from markDirty to notify. Fixes: QTBUG-111267 Change-Id: Ib7926a315cfd11ca6930c785290089b7031d34ff Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 12c62dd243dd139023fa1fc5c3a7c0fd8e3ee0ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Plumb QMessageBox::setCheckBox() through QPlatformMessageDialogHelperTor Arne Vestbø2023-03-097-16/+62
| | | | | | | | | | | | | | | | | | | | | | | | Without this plumbing we have no way of knowing if the QMessageBox has a checkbox set, and can't decide to skip the native dialog, leaving the user without the expected checkbox. As the suppression checkbox on macOS can be customized, we can use this plumbing to actually provide native dialog support for generic check boxes. This mechanism can also be used by QErrorMessage, which now matches behavior between native and non-native dialogs in terms of the label of the checkbox and its initial state. We might want to tweak this in the future, since user's might expect the suppression label and state to match the system default, but that's something we can expose from the platform theme if so, and should apply equally to the non-native dialog. Fixes: QTBUG-111803 Change-Id: Ied9fc34383fe79fbd8437592ad1c1993b9396178 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit a0313c85a9b8ab6ba0ec273f0c8638e2f7b8cc18) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QErrorMessage: Reset 'again' check box between each error messageTor Arne Vestbø2023-03-092-2/+2
| | | | | | | | | | | | | | | | The choice of whether to show a message again is per message, so when showing a new message we need to reset the check box back to its default checked state, otherwise the user might mistakenly dismiss more than the indented message. [ChangeLog][Widgets] QErrorMessage will now reset the check box for showing a message again for each new message shown, as each individual message has its own suppression state. Change-Id: I86d4bb5eabdb5b7a478c03516108a5edf87fcbe3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f2fc2013defc2f346fa1936dcf357d34bae3dbba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* docs: Remove side panel and swipe to remove examplesSanthosh Kumar2023-03-091-2/+0
| | | | | | | | | | | | Removed side panel and swipe to remove examples as part of patchset 3bc6f344a8f10699313c3e0c9236dd6945edd895 and updated docs to reflect that change. Fixes: QTBUG-110989 Change-Id: I6241dd9842b1584e3dd25057591fe29eaa34d579 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 87567f3a46885bcc110fbf041d5b1b6b8bd0e28d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix keyword for CMake commands related to deploymentJoerg Bornemann2023-03-083-3/+3
| | | | | | | | | | The pages are supposed to use the \keyword command to provide a target for the versioned command name. Change-Id: Ic91f5becc80985622a691aba96ce2c4e2984078e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 565e43fc704919923e53103911a72b3fec5c9d16) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: use () in references to cmake functionsVolker Hilsheimer2023-03-082-3/+3
| | | | | | | Change-Id: Ia4177a293c9c93edb8f27aec237df45b98caf20d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit a9427bedd48cf978fcc8c24c5da14a9b79326c71) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix xmlstreamlint to use the manual test apiAlexandru Croitor2023-03-081-22/+11
| | | | | | | | | | | Amends e13b57d06ab6e81cf04c090cc46dd23b4f8daccf Fixes: QTBUG-111774 Task-number: QTBUG-110647 Change-Id: I585cdf20e2e60d4e11170a6e2131b7abc2b7eaf3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b3a60e49cdd2ff82bb820be4278cf00298777a37) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Use non-native app modal message box from nested event loopsTor Arne Vestbø2023-03-071-0/+5
| | | | | | | | | | | | The NSAlert does not stay open when ran from a nested event loop, so we need to fall back to the cross platform dialog. The window modal dialog does not have this issue. Fixes: QTBUG-111524 Change-Id: I63fba0a092018bb19edeef78c06587455d752235 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 4e59a5252c11738ce4849032a5aa2a23f97a18ed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move anchor layout example to manual testsJan Arve Sæther2023-03-079-96/+17
| | | | | | Change-Id: I9c9a9dbcdaf705a31208b80b71e978938a492142 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 5773c3ac28dc3f7bd5e6e4571b99f944199fd9d7)
* Doc: fix QOpenGLWidget::defaultFramebufferObject documentationVolker Hilsheimer2023-03-071-7/+5
| | | | | | | | | | | | | Fix the link to QSurfaceFormat::StereoBuffers, and clean the text up a bit. If everything is a \note, then we might just as well not have notes, so move the statement about when this function is useful out of a note, and combine the statements elaborating on ownership and lifetime of framebuffer and contexts into a single note. Change-Id: I7cb1f9ff78ba760e99d639550130f5c833ad684a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 47df0eb5131a5fc0decd049bd3f9eefeb26276df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix syntax errorVolker Hilsheimer2023-03-071-1/+1
| | | | | | | | | Amends e0ecb0ded21082f4e00ee77411339009cb1294a4 Change-Id: If315d97e93047a8bece36c727c7646d30eb7458b Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> (cherry picked from commit 3ff66569eac5737af56a5bf910cbc2970d7312f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: fix link to QTest::failOnWarningVolker Hilsheimer2023-03-073-5/+5
| | | | | | | | | | Also fix incorrect failOnWarning*s* elsewhere in comments. Change-Id: I0bbc5e71060348153876f3d9a7c77c67f3c2e00d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 9e31631557ea3f99506377ff91a1e15e942f9e88) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: fix links to changed or renamed i18n pages and sectionsVolker Hilsheimer2023-03-072-3/+4
| | | | | | | Change-Id: Ibe00b793ae0943cdbbcfa272e5cae4e91da5bf7d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 2e6de6f8b27f4a3ed2fbaf2e393614ee8f09a043) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qsimd_p.h: remove LZCNT feature from the ARCH_HASWELL listThiago Macieira2023-03-051-2/+2
| | | | | | | | | | | | | | | | | | And for good measure, I'm also removing BMI2. The one we really care about ensuring gets enabled instead of -mavx2 is FMA anyway. Complements commit 29d3938aa56663f09666a0ac58b33e70e00abff2 (which in turn complemented commit a98cf15ed1b57aee695de01b04a974637b2cd44a), which removed BMI1 because AMD introduced it before AVX2. Looks like they also introduced LZCNT in some earlier processor too (family 10h) or GCC 12 began emitting __LZCNT__ for that family -- IIRC the AMD feature list was bigger than just the lzcnt instruction. Fixes: QTBUG-111698 Change-Id: I7f354474adce419ca6c2fffd1748f5b24f69a692 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 8413824ca00188fa36b6adf46d4a5bddb9515ec7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Resolve target suffix based on Qt build config for static pluginsTor Arne Vestbø2023-03-052-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtPlatformTargetSuffix() function is used in various places to determine the suffix of targets based on the config, which for macOS will result in a _debug suffix in debug mode. This becomes tricky when one project built in debug mode tries to depend on the libraries/plugins of another project (Qt) built in release, as the qtPlatformTargetSuffix() function uses the current CONFIG as input, which may be different than the QT_CONFIG (or CONFIG of whatever project is being depended on). For libraries this was fixed in 50e664835bc2130e8693364641f9aaa7133b6998 by iterating all known library paths, and trying the CONFIG suffix before falling back to release version. For plugins this was never solved, which becomes an issue when linking to static plugins, either in a fully static build of Qt, or when some of the plugins are static (permission plugins e.g.). In this situation, the user project has to have the same configuration as Qt was built with, to avoid errors like: error: no such file or directory: '~/6.x-static/qtbase/plugins/platforms/libqcocoa_debug.a' To work around this, we assume that a plugin installed into the Qt tree has the same build configuration as Qt itself, then then use QT_CONFIG as the determining factor when linking to the plugin. This still ties the build config of the plugin to the config of Qt, but relaxes the relationship to the application, allowing it to be built in either debug or release, which is an improvement to the current state. Task-number: QTBUG-110356 Change-Id: Icee67fc01313a6c6f34178a6345ccae1b57429d7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e2446afaa10ddd365d8de834d3fb1d00fd661355) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: fix links to qFuzzyIsNullVolker Hilsheimer2023-03-052-2/+2
| | | | | | | | | The function is in the QtNumeric documentation context. Change-Id: Ibc6a8961bc04efd4ab1eb50bb371e6a169d513dc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit c1cbb12e57e24b977b1a5c5be711793d6e67c113) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: fix qdoc warning, explicitly qualify enum typeVolker Hilsheimer2023-03-051-1/+1
| | | | | | | Change-Id: Ie289f2468a3a71d35696907691586a31f70d5b1e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit d48dbafeb24ee82ad6b97e8e5e9c9fcaa5f8a2d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build with -no-feature-lineeditTasuku Suzuki2023-03-052-6/+11
| | | | | | | | | Introduce a new feature for password dialog in cups that needs several widgets Change-Id: I93799b814ac06e661c19cffcd7d3c9bfa56ff814 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 45df0ed2462beefce1aa51abf3cda7bc18e52118) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc fix in QIntValidator::validate() and comment on a testEdward Welbourne2023-03-052-6/+7
| | | | | | | | | | | | | | The doc said positive values for a negative range were intermediate but the code actually rejects them if the value has an overt plus sign, so make clear that intermediate is only for the case without a sign. Incidentally comment on a test where it might not have been obvious to the reader that a space is the locale's digit-grouping chracter. Change-Id: I3edab74fe8c2cbe8448c0e523676f1fd0d0d8a9f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 58f5ec35f108bca01489124e74e96018fd937ed4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Simplify and relax UTF-8 locale override machinery for DarwinEdward Welbourne2023-03-051-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to try the various permutations of the language and region specific locales, as they all point back to the same CTYPE in /usr/share/locale/UTF-8/LC_CTYPE In addition, processes started from launchd come with an empty locale environment (LC_ALL/LC_*/LANG), and hence will default to the "C"/POSIX locale, even after picking up the environment. This primarily applies to applications launched from Finder, but also affects processes launched as background services. And since a child process will inherit its parent's environment the empty locale environment is propagated when running apps from IDEs such as Qt Creator or Xcode, or commands in an SSH login session (as sshd is a background service), unless the environment has been explicitly set up by the shell (Zsh). Since neither of these situations is the result of user misconfiguration, it makes little sense to spit our a warning. We however still warn if we detect that the character encoding has changed from the default "C" encoding, or if the encoding is "C", but we detect that the user has modified any of the relevant locale environment variables, as this indicates either a change in the system default behavior, or that the user has explicitly requested a "C" locale, which is wrong. Done-with: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Fixes: QTBUG-111443 Change-Id: I6fd14d1f8adddc2914d6ff4d3b5ad34a3871ef82 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ac6c7aa12fb6203855a745b2c1b4a1e07149b4af)
* QCoreApplication::initLocale(): Improve warning on failureEdward Welbourne2023-03-051-8/+18
| | | | | | | | | | | | | | | | | | | | | | If we fail to set a UTF-8 locale, the warning claims Qt shall use a UTF-8 locale, for which it reports an empty string, when in fact it isn't using a UTF-8 locale, although it'll interact with the system as if it were. Also, the user is liable to understand "system locale encoding" as referring to the underlying system rather than whatever they may have configured in a local shell; and a non-native speaker assures me the use of "shall" is also apt to confuse; so reword the messages. As the old locale is only needed for the code path prints the warning we can defer resolving it until we know we're going to use it, by querying the locale at that point. Done-with: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Change-Id: Ie6a6e7a707200e58335fcb64cb1584f0c307895a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit fff9395c2899841bdca07f400392595963d9ff93) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* GL paint engine: Fix drawPixmapFragments when using buffer objectsLaszlo Agocs2023-03-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until recently the buffer object-based code path (so not client-side pointers) was only hit with a core profile context. This changed at some point in 6.4 and later to support WebGL (that has no client-side pointers, unlike OpenGL ES 2.0 it is based on). Now buffer objects are preferred over client-side pointers, always. Problem is, drawPixmapFragment() was never functional on this code path, it seems. Expecting that transferMode() does all the uploadData() needed is wrong. transferMode() bails out if the mode is the same as before, and that's exactly what happens when an application calls drawPixmapFragments() on the painter twice, after each other. How exactly this works with client-side pointers is not fully clear, but presumably the data buffer address stays the same so all pointers passed in to the glVertexAttribPointer calls are valid, and it sources the data for each draw call (probably), thus the rendering is all correct even though only the first, not the second, drawPixmapFragment() led to calling uploadData() internally. Amends e487b07e18f1cb7ff126744be57b2ae1b9839c6c although this patch on its own is just as applicable pre-6.4 as well (to fix drawPixmapFragments when using a core profile context). Fixes: QTBUG-111416 Change-Id: I2ad358424e613192a51b99b937aef7660f5dbe08 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit d6c5a2f9177f427d14aae64d111c172d1bf28b6c) Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Move xmlstreamlint example into tests/manualØystein Heskestad2023-03-038-2/+2
| | | | | | | | | | | This example is useful but not a typical starting point for an application. Task-number: QTBUG-110647 Change-Id: Ic4af8ed648c587b91110a7403fa80c619549289d Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit e13b57d06ab6e81cf04c090cc46dd23b4f8daccf) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Move Weather Anchor Layout example to manual testsJan Arve Sæther2023-03-0317-72/+35
| | | | | | Change-Id: I8782a83b5c12b4f57bf9ef9063818cb124bddd56 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit a84b2e5973ace6327ef38644e023e0f81fad21f4)
* Remove the 'sdi' exampleVolker Hilsheimer2023-03-0319-646/+5
| | | | | | | | | | | | It is essentially the same as the other mainwindow examples, showing how to create a text editor. The only special code here is the tiling of the different main windows, which - without any documentation or explanation - is neither very helpful, nor relevant in 2023. Change-Id: I48b92b1cf057f586e0d2842d1c0a3312154e9a13 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 3c104c279911419f3d0a9e6f3ac050e6f3968e7e) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
View Lorry Controller Status