summaryrefslogtreecommitdiffstats
path: root/src/tools/windeployqt/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* windeployqt: Deploy target dlls for directx and vc runtimeOliver Wolff14 days1-5/+10
| | | | | | | | | | | When deploying for a cross compiled target we should deploy the target versions of directx and compiler runtime dlls. Thus a new platform was added to utils to be able to reflect this distinction. Fixes: QTBUG-124719 Pick-to: 6.7 Change-Id: I4dd797804fa871d76d56f8775b188d4306b51e5a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make deployment of openssl plugin optionalOliver Wolff2024-03-211-5/+77
| | | | | | | | | | | | | | | Qt's openssl plugin is dependent on openssl libraries. Users should make a conscious decision about deployment of the plugin and the corresponing libraries so deployment of that functionality is now opt in. [ChangeLog][Tools][Windeployqt] Deployment of openssl plugins is now optional. For proper deployment of openssl related functionality pass in --openssl-root to make sure that openssl libraries are also deployed. Fixes: QTBUG-117394 Change-Id: Iad43c7666b9af491f7695783b4e23a811256515b Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* Windeployqt: prevent output for --list optionTimothée Keller2024-03-151-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 Keller2024-03-141-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>
* Windeployqt: improve multiple directory warningTimothée Keller2024-03-141-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>
* Windeployqt: introduce --include-soft-plugins command line optionMichał Policht2024-03-071-20/+42
| | | | | | | | | | | | | | | 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>
* 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>
* Remove extra semi-colonsTasuku Suzuki2024-02-061-1/+1
| | | | | Change-Id: I92fddb36cd136fd1bd627955f15d0559b9942d7e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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>
* 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>
* windeployqt: Proper error message when qtpaths.bat/.exe could not be runOliver Wolff2023-12-111-6/+6
| | | | | | | | | 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>
* Windeployqt: Fix -v/--version optionTimothée Keller2023-11-281-2/+9
| | | | | | | | | | | While the version option was already there, it had no output attached to it, and simply generated the whole help text. Make sure that if the -v/--version option is set, only the tool version is outputted. Fixes: QTBUG-119511 Pick-to: 6.6 Change-Id: I59ee620333c02eb0a031cd05ac3170216cd034fa Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: add options to deploy/block pluginsTimothée Keller2023-10-311-29/+121
| | | | | | | | | | | | Some plugin types are pulled in by default by certain modules. Give users the option to add/skip plugins and/or their types. [ChangeLog][Tools][Windeployqt] Windeployqt now has options that allow for custom plugin deployment. Users can include or exclude them, either individually, or by type. Fixes: QTBUG-117910 Pick-to: 6.6 Change-Id: I85235783dcd814396f184912269cd5976717b2dd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Don't copy files from unneeded QML modulesArno Rehn2023-10-101-3/+22
| | | | | | | | | | | | | | | | | | | Previously, windeployqt would recurse into subdirectories when copying QML modules, even if those subdirectories were a nested QML module that was not needed for deployment. Since most QML modules are nested in the QtQuick and QtQml modules, the old code effectively always copied *all* QML modules. This patch adds guards that prevent recursing into subdirectories if those subdirectories represent QML modules. These nested modules will still be deployed, but only if referenced from the QML application (as determined by qmlimportscanner). Fixes: QTBUG-117459 Pick-to: 6.6 Change-Id: I4c0dfc15956ff40a0e8caec3fa334df10cc92ccd Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Windeployqt: fix typoTimothée Keller2023-10-061-1/+1
| | | | | | | | | | Change "qpaths" to "qtpaths" since the former is not a valid option. Fixes: QTBUG-117817 Pick-to: 6.6 6.5 Change-Id: Ib8c8c80f31c1c54747340442c6bf3185c7c69001 Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* [windeployqt] Copy v8 context snapshotAnu Aliyas2023-09-121-5/+7
| | | | | | | | | - Copy v8 context snapshot while creating package with windeployqt Fixes: QTBUG-116777 Change-Id: I707e1d147ebf0ba5ee63dd25218e23ac850efe45 Pick-to: 6.6 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Remove elfreader and other unix leftovers from windeployqtOliver Wolff2023-08-221-33/+14
| | | | | | | | | | | Back then elfreader and other unix functionality was added for the purpose of having one generic deployment tool but it was never used. Remove the code to be more clear on what to expect. Pick-to: 6.6 Change-Id: I2b7a759de04afe0c5fb210ad65f1c86e32934f18 Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* windeployqt: Do not deploy insighttracker plugin by defaultOliver Wolff2023-07-271-4/+25
| | | | | | | | | | | | | | | | Qt insight's TP is using plugin type "generic" so that insight plugins can be deployed for every Qt application. As "generic" plugins are part of QtGui windeployqt deploys these if a dependency to QtGui is found. As defaulting to a deployment of insight plugins might cause confusion among users, we make deployment of these plugins explicit if the module is available. Pick-to: 6.6 6.5 6.2 5.15 Change-Id: I9d2a8595373d5a15b7afbeaf7174226563b1cb6f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Windeployqt: also add internal modules to module listTimothée Keller2023-07-121-0/+2
| | | | | | | | | | | | | | Not adding internal modules to the windeployqt module list makes it give off nonsensical warnings, and can force the deployment of debug libraries despite a --release tag. Add them in to prevent this, and shave off the "Private" part of the module name if it exists to maintain compatibility. Fixes: QTBUG-114854 Pick-to: 6.6 6.5 Change-Id: I884fdc495f340ad20ba6257587da170d6c1a1415 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update windeployqt with dxcLaszlo Agocs2023-06-271-0/+13
| | | | | | | | Basically an adjusted version of findD3dCompiler() that looks for two, not one, DLLs. The logic is the same, with added support for ARM64, though this has not been verified in practice. Fixes: QTBUG-114789 Change-Id: I1fec51fc98a5146e2770e13cf2f3b160ac4282d6 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
* Windeployqt: Add a check for LLVM-MinGW runtimesTimothée Keller2023-04-201-20/+36
| | | | | | | | | | | | | | | The compilerRuntimeLibs now pays attention to if the user is running MinGW, or LLVM-MinGW, before deploying the corresponding runtimes from the Qt binary folder, or from the path if it cannot find any in the Qt binaries. [ChangeLog][QtTools][Windeployqt] Windeployqt now supports LLVM-MingGW runtimes. Pick-to: 6.5 Change-Id: I9c464cdb933795e491992f5d1adb18bcc7d69f02 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Yuhang Zhao <yuhangzhao@deepin.org>
* Windeployqt: change MinGW dll's import locationTimothée Keller2023-04-171-11/+16
| | | | | | | | | | | | The MinGW runtimes were imported through the PATH, which creates mismatches with the expected libraries that are installed directly through Qt. Check if those can be used instead, and issue a warning (and default to PATH) if not. Fixes: QTBUG-112448 Pick-to: 6.5 Change-Id: I061baabb6d6188bd0817b68c39a5d9f04ff391b5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Add option to skip plugin types during deploymentOliver Wolff2023-04-121-9/+21
| | | | | | | | Pick-to: 6.5 Fixes: QTBUG-112317 Change-Id: Idb294105ee2006a36067d3967af1b7b55b375bd7 Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* windeployqt: Remove special handling of virtual keyboard pluginOliver Wolff2023-04-121-18/+0
| | | | | | | | | | | | virtualkeyboard is a qt module and thus covered by the "no-<module" switch. The special handling is no longer needed with the more dynamic approach of handling Qt modules. Pick-to: 6.5 Change-Id: Ice6e30261e60b484669748411e019764bbdeaa55 Reviewed-by: Yuhang Zhao <yuhangzhao@deepin.org> Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Windeployqt: change qtModule return value to prevent invalid modulesTimothée Keller2023-04-061-8/+14
| | | | | | | | | | | | When the change from quint64 to bitsets was originally made, the return value of the qtModule function was not adapted. Where returning 0 was fine for the quint64 values which started at 1, returning 0 now adds the first module instead of adding nothing to the used/required modules Fixes: QTBUG-111984 Pick-to: 6.5 Change-Id: Id1e2b3237a36335ec5071180b4c73f99d5eb5c8d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: Prevent '.' and '..' from being added to lconvertTimothée Keller2023-04-061-1/+6
| | | | | | | | | | | | | | If windeployqt is not able to retrieve any translation information from the catalog, the translationNameFilters will be empty. This allows the '.' and '..' folders to be passed to lconvert which in turn causes an error for the whole deployment. Added a check for the filters being empty, and a warning in case we have to preemptively return from the translation deployment. Fixes: QTBUG-112204 Pick-to: 6.5 Change-Id: I0d114186e630cc3696250006fa093c4c596eb40d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: Simplify infix detection for --libinfix buildsTimothée Keller2023-04-061-18/+5
| | | | | | | | | Removed fetching the infix through the QtCore Module, since it is already provided by qtpaths -query Pick-to: 6.5 Change-Id: I844305fc66b21af094724dd3f516078447ee1dd2 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: prevent directory creation for dryrunsTimothée Keller2023-03-241-8/+8
| | | | | | | | | Added a check for dryruns when creating directories, to properly reflect expected behavior. Pick-to: 6.5 Change-Id: I72063e4d32302d304f8174701e38e275b404706b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: allow user set translation directoryYuhang Zhao2023-03-241-1/+9
| | | | | | | | | | Add the "translationdir" option, which allows the user to choose a different directory to deploy the translation files. Pick-to: 6.5 6.4 Change-Id: Iacf2031abb6d992e6765c02f232f81317b784720 Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: add custom qml output directory command line optionTimothée Keller2023-02-131-2/+14
| | | | | | | | | | | | | | | Added the qml-deploy-dir option, which deploys imported qml files to the directory passed as an argument. If no option is given, a "qml" directory is created, and files are deployed there. [ChangeLog][QtTools][Windeployqt] Windeployqt's default behavior is now to deploy qml imports to a "qml" directory inside the deploy directory, rather than directly to the deploy directory. Task-number: QTBUG-99516 Pick-to: 6.5 Change-Id: I49262a38c4a42ef20b05b603f5eb5393fe9cc218 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Remove hard-coded information about modules and pluginsJoerg Bornemann2023-02-071-326/+230
| | | | | | | | | | | | | | | | Windeployqt now reads modules/*.json and translations/catalogs.json to determine the available Qt modules, Qt plugins and their corresponding translation catalogs. This patch removes the hard-coded information that was used before. Now, we don't have to update windeployqt anymore to teach it a new Qt module. Pick-to: 6.5 Fixes: QTBUG-109841 Task-number: QTBUG-106342 Change-Id: Ib7b7f44ca7d40d0c73d717d8494367af412ebdbe Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Windeployqt: Multiple directory use warningTimothée Keller2023-01-111-0/+5
| | | | | | | | | Added a warning for when windeployqt is used with multiple binaries which are in different directories. Pick-to: 6.5 Change-Id: Ic43aa9847eb2bf6927cebf5d457595eed6b16b5a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: change qml import handlingTimothée Keller2023-01-111-1/+1
| | | | | | | | | | Made it so that qml dependencies will be imported for all invoked binaries, rather than just the first one. Task-number: QTBUG-99125 Pick-to: 6.4 Change-Id: I0d97905c59281a03ef2126ae1c436f1034e1575d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Remove support for QtQuick1Joerg Bornemann2023-01-101-34/+20
| | | | | | | | | | This module is long gone. Pick-to: 6.5 Task-number: QTBUG-105135 Change-Id: I58bb2dd04a278830a34747267c6c6058614b7342 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: Remove quint64 type for QtModuleTimothée Keller2023-01-091-3/+0
| | | | | | | | | Changed the type of the QtModule enum to no longer be quint64, since the bitset change doesn't require it anymore. Pick-to: 6.5 6.4 Change-Id: I000107d23da959c28c26086f0b704252f36619f8 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: add missing module and pluginTimothée Keller2022-12-161-4/+7
| | | | | | | | | | Added the QtOpcUa module, as well as the relevant opcua plugin Fixes: QTBUG-109336 Pick-to: 6.4 Change-Id: I5edd886e6224de14cd2b68727655c64514ef5158 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: change platform plugin base filterTimothée Keller2022-12-091-0/+2
| | | | | | | | | | Add infix to "qwindows" for platform plugin search if it exists, to account for libinfix builds Task-number: QTBUG-105820 Pick-to: 6.4 Change-Id: I7a3c671fb6cdb4a216f6f4bffb445add4f8e0c83 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update list of windeployqt modulesTimothée Keller2022-12-091-3/+17
| | | | | | | | | | Added Quick-controls,dialogs,layouts,shapes,test,timeline,3d- modules to the windeployqt module list Task-number: QTBUG-105135 Pick-to: 6.4 Change-Id: Id5bbaa4b86f1ec9861ee308cec6deff50704c77f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update list of windeployqt modulesTimothée Keller2022-12-081-3/+11
| | | | | | | | | | Added Positioningquick, Sensorsquick, Webenginequick, and Webviewquick modules to windeployqt list Task-number: QTBUG-105135 Pick-to: 6.4 Change-Id: I26c0b5006453c8533ff94967b2e8f03ede88bf7e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update list of windeployqt modulesTimothée Keller2022-12-061-11/+17
| | | | | | | | | Added DBus, StateMachine and 3DLogic modules to windeployqt module list Task-number: QTBUG-105135 Pick-to: 6.4 Change-Id: Ied8624e87f62bd655db8b82cf9fe20d72873d823 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: adjust bitset change for scalingTimothée Keller2022-12-031-4/+5
| | | | | | | | | Replaced the ullong with Modulebitsets for when the number of modules exceeds 64 Pick-to: 6.4 Change-Id: I489d35bc53d6aacf7907f75957bd8c6d21fbeb60 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update windeployqt pluginsTimothée Keller2022-11-191-0/+1
| | | | | | | | | Added scxmldatamodel to plugin mappings Task-number: QTBUG-100700 Pick-to: 6.4 Change-Id: I58af7c0e47d3d9b7fc4d733610dcee8a7cb17228 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: replace enum with bitsetOliver Wolff2022-11-171-100/+113
| | | | | | | | | we are running out of enum values for the flags. Pick-to: 6.4 Change-Id: Idd7cabb0c46c0c95eb4a87d047defb15ddeef024 Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Update list of windeployqt modulesTimothée Keller2022-11-081-2/+10
| | | | | | | | | Added QtMqtt and QtPdf to the windeployqt module list Task-number: QTBUG-105135 Pick-to: 6.4 Change-Id: Ic8a8a0c157663088341ed5a1a417dcb57a717286 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update list of windeployqt modulesTimothée Keller2022-11-071-54/+64
| | | | | | | | | Added QtCharts, QtDataVisualization, QtRemoteObjects, QtScxml, and QtNetworkAuthorization to the windeployqt module list Task-number: QTBUG-105135 Pick-to: 6.2 6.4 Change-Id: I16f2897583518c4577eeeda2dc0a6f413fef9794 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt command line module expansionTimothée Keller2022-10-271-2/+4
| | | | | | | | | | Added command line option for passing core5compat module in windeployqt Task-number: QTBUG-104845 Pick-to: 6.2 6.4 Change-Id: I6a0e13532edac4580e03d83be79f7db4ac54e3bf Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Deploy Qt Designer plugins for QtUiToolsFriedemann Kleint2022-10-181-33/+63
| | | | | | | | | | | | | Make QtUiTools a known module with command line options and plugin dependencies. Note: There is no automated dependency checking for those plugins as this can lead to undesired libraries being pulled. Pick-to: 6.4 Fixes: QTBUG-104831 Change-Id: I31a0c3620460d6558edcf8245f43502f2bca7748 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-111-10/+10
| | | | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace, with manual unstaging of the actual definition and documentation in dist/, src/corelib/doc/ and src/corelib/global/. Task-number: QTBUG-99313 Change-Id: I4c7114444a325ad4e62d0fcbfd347d2bbfb21541 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 08:14:08 +0000