summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
* Fix dangling references - GCC 14Liang Qi16 hours1-1/+1
| | | | | | | | This amends 18def77d27f88ce26b6af29fe56a80429fed555d . Pick-to: 6.7 6.6 6.5 Change-Id: Icadf46326f1fda1bdbcd40d101170581e510b87a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windeployqt: prevent output for --list optionTimothée Keller4 days1-4/+5
| | | | | | | | | | Some outputs weren't guarded with the optVerboseLevel which caused them to occur even with the --list option. Add a guard to prevent for that. Fixes: QTBUG-122257 Pick-to: 6.7 6.6 Change-Id: Ide060cda4ac6f9b4470ca608120e2b8aa4819de5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Revert "Windeployqt: remove unused library list"Timothée Keller4 days1-1/+12
| | | | | | | | | | This reverts commit a05abede682db4ab20a7c1d9eb45a487e91d6a78. Reason for revert: Causes QTBUG-123325 Change-Id: I251b67798af3d768db6f2836b52ded558c0c8211 Pick-to: 6.7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Bootstrap: remove unused sourcesThiago Macieira5 days1-10/+2
| | | | | | | | | qiterable.cpp is even a comment-only source. Change-Id: I01ec3c774d9943adb903fffd17b79d567a435594 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Windeployqt: improve multiple directory warningTimothée Keller5 days1-3/+5
| | | | | | | | | | | | | The multipleDirs warning was added to avoid surprises related to where windeployqt would deploy files when using binaries from different paths. To do this properly, make the warning message more meaningful, and suppress the warning when the --dir option is specified, i.e. when the user is already explicitly choosing where to deploy. Pick-to: 6.7 6.6 Change-Id: Ie2984f4af740776c568610370d49ad4ff85ffff0 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Bootstrap: remove qnumeric.cpp by using qnumeric_p.hThiago Macieira5 days1-1/+0
| | | | | | | | | That is, use the inline functions that refer to <numeric_limits> and <cmath> directly, instead of the out-of-line wrappers. Someone should verify if the hacks for QNX's <math.h> are still required. Change-Id: I01ec3c774d9943adb903fffd17b7ee560b4b71b9 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
* Bootstrap: remove QDirListing/QDirIteratorThiago Macieira5 days1-1/+0
| | | | | | | | | | Bootstrapped tools don't usually need to list directories; they should operate on file lists passed to it by the build system instead. This may deserve a QT_FEATURE. Change-Id: I01ec3c774d9943adb903fffd17b7ecfba2702fc5 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
* Bootstrap: remove QTemporaryFileThiago Macieira6 days1-1/+0
| | | | | | | | | Done by harmonizing the use on the QT_CONFIG(temporaryfile) macro and fixing one test that was missing. We can't remove the older macro because it is marked PBULIC) but we don't need to use it ourselves. Change-Id: I01ec3c774d9943adb903fffd17b7eb4dd1a4e63f Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
* Bootstrap: remove QRandomGeneratorThiago Macieira6 days1-1/+0
| | | | | | | | | | | The bootstrapped tools really mustn't produce random output (they must always be reproducible exactly). Therefore, ensure we don't need this file. Change-Id: I01ec3c774d9943adb903fffd17b7eb94dbd4be89 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Bootstrap: remove QVariantThiago Macieira6 days1-1/+0
| | | | | | | | | I added QT_NO_VARIANT to qconfig-bootstrapped.h to be clearer on what the #ifs are, but there's no testing of that feature outside of QT_BOOTSTRAPPED. Change-Id: I01ec3c774d9943adb903fffd17b7e8ac4340fb89 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Bootstrap: remove QDataStreamThiago Macieira6 days2-10/+3
| | | | | | | | | | | It was only used by the cmake_automoc_parser so it would write a 64-bit in big-endian format. So bypass QDataStream and write it native endianness. Change-Id: I01ec3c774d9943adb903fffd17b79c78e56db4cf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Windeployqt: introduce --include-soft-plugins command line optionMichał Policht12 days2-21/+44
| | | | | | | | | | | | | | | Some plugins may have dependencies on additional Qt modules. This is handled by deployPlugin() function. Existing code does not look for plugins associated with these modules however, because the loop iterates over plugin directories only once. This change introduces an option that will make windeployqt take into account all such soft dependencies by making recursive calls to findQtPlugins(). Pick-to: 6.7 Task-number: QTBUG-121583 Change-Id: Id6535426a47f9b92a3035e864dfdd7577b82c9ad Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Timothée Keller <timothee.keller@qt.io>
* Move qAbort from qglobal.cpp to qassert.cppThiago Macieira13 days1-1/+0
| | | | | | | | | | | It makes more sense there, as all the other functions in that file are about early termination. This allows us to remove qglobal.cpp from the bootstrap library, because qglobal.cpp now only has the callback tables. Amends 8f13af5d7b9b659208a8a93e6581d30b434dae1f. Change-Id: I01ec3c774d9943adb903fffd17b7ea92404bdbd3 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Port to QDirListingAhmad Samir2024-03-034-24/+20
| | | | | | | | | | | Use QDirListing in the Bootstrap build instead of QDirIterator. Drive-by changes: - more const variables - use emplace_back() instead of append() where appropriate Change-Id: Ie1f0d03856e557c4bfabfff38a87edc7da86d091 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* androiddeployqt: fix QDirIterator::next() usageAhmad Samir2024-03-011-2/+3
| | | | | | | | | | | The code inside the loop body uses it.next() twice, however hasNext() is called only once; each call to next() advances the iterator. Amends 4041610cb202699a47268975e5aaecaa1f182c0a. Pick-to: 6.7 6.6 6.5 6.2 5.15 Change-Id: Idb96cfbddc56e0d7ed38ab1b0279f40592c75175 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Fix spelling of FFmpeg in (end-)user-visible string of windeployqtVolker Hilsheimer2024-03-011-2/+2
| | | | | | | | | It's two capital "FF", lowercase "mpeg". Pick-to: 6.7 6.6 6.5 Change-Id: I4eca719fa6ce0133e3ddb6163c81e24493b378e3 Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
* synqt.cpp: scan for and reject #pragma onceMarc Mutz2024-02-291-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | In 2022¹, we gave ourselves the rule to allow #pragma once only in non-installed headers (examples, tools, snippets, ...), because the same installed header may reside in different places in the filesystem and #pragma once would treat these as separate headers, causing multiple-definition errors. Recently, the question came up: "What constitutes a public header?" Non-_p.h headers in e.g. src/plugins/ muddy the waters here a bit. Since #pragma once is forbidden in installed headers, I had the idea to use it to indicate non-installed headers. This patch enables use of #pragma once as a static assertion to that effect, should we so choose. ¹ https://lists.qt-project.org/pipermail/development/2022-October/043121.html Pick-to: 6.7 6.6 6.5 Fixes: QTBUG-122813 Change-Id: I3b5beef72e154cf5bf1ccd4b6f02df9680609e43 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* syncqt.cpp: Extract Lambda error()Marc Mutz2024-02-281-3/+6
| | | | | | | | It will be re-used in a subsequent patch. Pick-to: 6.7 6.6 6.5 Change-Id: Ia58020a39440d5e583450f7adecf561f7267c403 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Fix the qtpath issue with lto enabledAlexey Edelev2024-02-281-1/+1
| | | | | | | | | | | | Move qtconfManualPath pointer to the unnamed namespace, so it's never exported. Add the static setQtconfManualPath method that sets the pointer at runtime. Fixes: QTBUG-122739 Pick-to: 6.5 6.6 6.7 Change-Id: Icfc631f9680ad5f484920b0fdf3e408b7657c108 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* PCRE2: upgrade to 10.43Giuseppe D'Angelo2024-02-191-0/+1
| | | | | | | | | | | | Apart from some source code reshuffling, 10.43's JIT has dropped its support for ARMv5. [ChangeLog][Third-Party Code] PCRE2 was updated to version 10.43. Pick-to: 6.7 6.6 6.5 Change-Id: I7909f0a9358f38282f5eaeacd2eb10529b47e63c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* rcc: Suppress MSVC warning C4711 in generated codehjk2024-02-191-0/+4
| | | | | | | | | | | | | The informational message Warning C471 1function 'int __cdecl qInitResources_qrc(void)' selected for automatic inline expansion is triggered by /W4. Fixes: QTBUG-122176 Change-Id: Ifbd2e969b1bb7d25e1b83a4c5d8b305e7b6883a2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Apple: Fix a few deprecation warnings after bumping deployment targetsTor Arne Vestbø2024-02-191-0/+6
| | | | | | | | | | | | - kIOMasterPortDefault -> kIOMainPortDefault - Use UTType instead of Carbon Core functions/constants - NSWorkspace iconForFileType -> iconForContentType - Removed obsoleted kUTTypeInkText pasteboard type There are still a few more, but these will be fixed in follow ups. Change-Id: Ibbca226d578b4ba64bd9c8c5d0addc1870114a20 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Fix documentation of used digest and signature algorithmAndré Klitzing2024-02-151-2/+2
| | | | | | | | | | SHA-256 is used since 2019. This amends c9f8893000249bd5701674c53d18a823b4a1c629. Pick-to: 6.7 6.6 6.5 Change-Id: I005aa3414e4606045c8c3b01d71547efcf4122ba Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Change license for tools filesLucie Gérard2024-02-0720-20/+20
| | | | | | | | | | | | According to QUIP-18 [1], all tools file should be LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I89e08859871d29a9cf8c7a56b30b07b2c2f34b42 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Change license for examples filesLucie Gérard2024-02-0711-11/+11
| | | | | | | | | | | | According to QUIP-18 [1], all examples file should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I185ebdff2faa5e4af6ac0ee77c3ae33faae06e7d Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Remove extra semi-colonsTasuku Suzuki2024-02-062-3/+3
| | | | | Change-Id: I92fddb36cd136fd1bd627955f15d0559b9942d7e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Bootstrap: remove QBitArrayMarc Mutz2024-01-311-1/+0
| | | | | | | | | | It appears to be used only in qlalr, which is, however, not bootstrapped. Pick-to: 6.7 6.6 6.5 6.2 Change-Id: Idc16d957bf687238c7b0ee603d8b092e2048ef18 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* moc: store the FQN in JSON superClass objectsMarc Mutz2024-01-262-2/+16
| | | | | | | | | | | Tooling can then use this information to find the correct base class, even absent C++ scoping information. Pick-to: 6.7 6.6 6.5 Task-number: QTBUG-101141 Change-Id: I5350da8d2d9aaf5ec86027357131ebac1eb50372 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* moc/QMetaProperty: Remove limitation on non-own-class notify signalsFabian Kosmale2024-01-262-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | The moc generated code does a sanity check that NOTIFY signals actually exist in the parent class when they cannot be found in the class moc currently runs on. The logic there was however too simplistic, and couldn't deal with signals taking a parameter. Fix this, and take the opportunity to use a proper static_assert instead of generating a "normal" compile error. We do not do any checks for the presence of QPrivateSignal, as the whole point of QPrivateSignal is that it should be private (and not e.g. protected). Moreover, we adjust QMetaProperty::notifySignalIndex to take single-argument notify methods into consideration as well when encontering an unresolved notify index. Fixes: QTBUG-115989 Pick-to: 6.7 Change-Id: I8a056a15777f3132691e207b4b9ab6c2c9b2126d Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Partially disable sanitizers for syncqtAlexandru Croitor2024-01-221-0/+8
| | | | | | | | | | Won't work when syncqt is built using qt_internal_add_configure_time_executable. That needs some extra infrastructure. Task-number: QTBUG-121348 Change-Id: I627dea39c906ea374848d848b0ea740826991140 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Windeployqt: also allow platform-type plugin selectionTimothée Keller2024-01-161-11/+11
| | | | | | | | | | | Including/excluding plugins of the platforms type did not work, since windeployqt was only ever looking for 'qwindows'. Keep the default behavior of deploying 'qwindows.dll', but also allow users to add/remove platform-type plugins. Pick-to: 6.7 6.6 Change-Id: I4062a71939224d1462896d95a2541e8caced399d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: remove unused library listTimothée Keller2024-01-151-12/+1
| | | | | | | | | | | | When windeployqt had hard coded module information, it had result.directlyUsedQtLibraries, and result.usedQtLibraries. The latter was meant to add in the modules that weren't defined. Since we now read available modules directly, there is no need for result.usedQtLibraries since it should always be identical to result.directlyUsedQtLibraries. Pick-to: 6.7 Change-Id: I60e38c176b11626c1ef5a844e80bc701a9eed189 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: add output for determining plugin/module relationTimothée Keller2024-01-151-2/+2
| | | | | | | | | | | | Windeployqt has a pull all in approach to plugins. This can require some modules to be deployed despite being unrelated to the application's dependencies. An output is added to provide information to better reflect what windeployqt is doing in this regard. Task-number: QTBUG-117910 Pick-to: 6.7 6.6 6.5 Change-Id: Iabf89e0faca862a90c0fcd46e5675dd43655be1d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* syncqt: always use absolute path in the generated headersFlorian de Gaulejac2024-01-121-6/+1
| | | | | | | | | The relative path + source path can be tool long for windows Fixes: QTBUG-120758 Pick-to: 6.5 6.6 6.7 Change-Id: I42ed4f3bbf39d31bf37a5bc76eb18f473661346b Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Add the support of the qt_import_plugins functionality to androiddeployqtAlexey Edelev2024-01-111-22/+48
| | | | | | | | | | qt_import_plugins allows to control application deployment on non-Android platforms. This adds support for the pre-defined plugin list that is computed using the qt_import_plugins input. Task-number: QTBUG-118829 Change-Id: Iaa9c3f600533a4b5a3079ab228fabf212d9ce5a5 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Dissociate QTypeRevision from QVersionNumberMarc Mutz2024-01-101-1/+1
| | | | | | | | | | | | | | | | They have nothing to do with each other, so give QTypeRevision its own header and implementation file instead of piggy-backing on QVersionNumber's. Picking back to current LTS to incur the merge conflict only once, not per (expected) follow-up change. Amends ed080c64ae21d22115d16780a5903d7cc4fd1546. Pick-to: 6.7 6.6 6.5 Change-Id: I2fa5d0e68f95864126bc95e3d8154134eee85553 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Android: update androiddeployqt doc pageAssam Boudjelthia2023-12-211-97/+32
| | | | | | | | | | | | | * Prioritize CMake snippets. * Remove unrelated mention to various qmake variables. * Mention the page for command line configuration and building and remove the same duplicated command from this page. * Mention the page for customizing the build from the Android docs. Task-number: QTBUG-115020 Pick-to: 6.7 Change-Id: I966c37661e17f6ffb8d25bfa3cd91e92be364e1d Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* Android: fix typo in androiddeployqt commandAssam Boudjelthia2023-12-201-1/+1
| | | | | | | Task-number: QTBUG-115020 Pick-to: 6.7 6.6 Change-Id: Ia82c6a421a148bb462d67be5757f73068aa6d382 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* AndroidTestRunner: make build command program deduction more robustAssam Boudjelthia2023-12-181-1/+1
| | | | | | | | | | | | Currently, if the cmake program path passed to androidtestrunner contains space, QProcess will get an invalid program path. To fix that, quote the cmake command passed to androidtestrunner and use QProcess::splitCommand() to get the program and args list. Task-number: QTBUG-105524 Pick-to: 6.7 Change-Id: Icb665033884127972bff205157ff22aa469c135c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Deploy FFmpeg dlls with windeployqtJøger Hansegård2023-12-181-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we add support for dynamically linked FFmpeg, some FFmpeg libraries will be available in the bin directory. windeployqt should then copy these libraries to the application directory if the ffmpeg media backend is included. This patch extends windeployqt with support for deploying these FFmpeg libraries. Potential issues: 1. This patch hard codes the FFmpeg library names that we currently depend on, such as 'avcodec' or 'swresample'. 2. We don't take version number of the FFmpeg libs into account. This is done to reduce the maintenance burden when we upgrade FFmpeg, and should not be a problem as long as we have a single version of FFmpeg in the online installer. 3. Finding the library names is a bit quadratic in complexity, bound by the number of libraries in the bin folder, but should not be too slow. 4. We need to update windeployqt if we add or remove ffmpeg libraries. An alternative would be to identify all dlls that the ffmpeg media plugin depends on, and then deploy all files that exists in the bin directory instead of hard-coding library names. This would, however be a bit more fragile because we would not be able to warn if a library was missing. Note that this patch is a workaround. It is needed because Qt does not properly support CMake's runtime dependency features with platform plugins. Even if we added FFmpeg binaries to the dependencies set, they would not be visible at install time. Change-Id: I4b23e50429d16e8487bf43ce9982ff37d02ffbe2 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
* tools: port away from QPairMarc Mutz2023-12-148-22/+25
| | | | | | | | Pick-to: 6.7 Task-number: QTBUG-115841 Change-Id: If122a1c17b1b4092b115521cec814ce3b508cd80 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
* AndroidTestRunner: few minor fixes for loging and printingAssam Boudjelthia2023-12-141-13/+12
| | | | | | | | | | | | | * Don't add \n when using qDebug() * Trim testAppArgs of extra space at the end. * Don't print get-current-user command by default, that value is not that useful to be always printed. * Update outdated bit of the help printout to reflect what the test runner does. Pick-to: 6.7 Change-Id: I998bafc3aef524b368654f7b35a2a8e084d17542 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* Remove mentioning of UWP from windeployqt's configure summaryOliver Wolff2023-12-131-1/+1
| | | | | | | | Qt's UWP port has been dropped for Qt 6.0. Pick-to: 6.7 6.6 6.5 6.2 Change-Id: I72f2cfbd1234110a0bd0c15669fa326328d4d08c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* moc: port from pair<> to a struct SuperClassMarc Mutz2023-12-133-14/+16
| | | | | | | | | | | | ... with properly-named members. This is in preparation of adding a new member in order to fix QTBUG-101141 (namespaced base classes). Pick-to: 6.7 6.6 6.5 Task-number: QTBUG-101141 Change-Id: I2309e425ac94ad275b54a898fd33a2891e5d1453 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* AndroidTestRunner: replace fprintf() with Qt logging callsAssam Boudjelthia2023-12-131-20/+14
| | | | | | | | To make the code more uniform. Pick-to: 6.7 Change-Id: I84cc9c6169e9eb5a4ba4909b6a7178206eb57c4d Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* AndroidTestRunner: add new TestInfo structAssam Boudjelthia2023-12-131-19/+25
| | | | | | | | | | This contains test specific variables like pid, sdkversion, isPackageInstalled and isTestRunnerInterrupted which don't strictly fall under 'Options'. Pick-to: 6.7 Change-Id: I7c4a3422813f464b407d9b2be98c5b4a807c4f1e Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* AndroidTestRunner: log when timing out waiting for the test to finishAssam Boudjelthia2023-12-131-0/+3
| | | | | | | | | Leave a log message to know when the test runner timed out or the test finished. Pick-to: 6.7 6.6 6.5 Change-Id: If56ecaa5b0e3af22b3e26480a584e2d52ac97553 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* AndroidTestRunner: uninstall the test when interruptedAssam Boudjelthia2023-12-131-21/+48
| | | | | | | | | | | | | | | If the test runner was interrupted, stop waiting for the test to start or to finish, go fetch the available test results and logcat and uninstall the test app. Also, set CMake TIMEOUT_SIGNAL_NAME to SIGINT and TIMEOUT_SIGNAL_GRACE_PERIOD to 10 seconds to allow enough time to fetch the logs and uninstall the test app. Task-number: QTBUG-106479 Pick-to: 6.7 6.6 6.5 Change-Id: I4820cfe58f05d15179b4af819caa92e475881634 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* windeployqt: Proper error message when qtpaths.bat/.exe could not be runOliver Wolff2023-12-112-9/+13
| | | | | | | | | If qtpaths cannt be found windeployqt should complain about that fact. Previously it complained about "Unsupported platform". Pick-to: 6.7 6.6 6.5 Change-Id: I4db954633c31ceac69c4d3c0e55cbe942c3272fd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix build with -no-feature-processTasuku Suzuki2023-12-071-1/+1
| | | | | | | | | androidtestrunner uses QProcess Task-number: QTBUG-105524 Change-Id: If12eb011bbfb9848593657f86aa78b49309080e7 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>