summaryrefslogtreecommitdiffstats
path: root/src/windeployqt/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* windeployqt: Use correct file name for ANGLEYuhang Zhao2020-02-181-1/+1
| | | | | | | In most cases, the letter "v" is always lower-cased. Change-Id: I3748357f548f62b6ea7f6d1f3ee8d404fec34f8b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Fix deployment of MinGW/release with debug infoFriedemann Kleint2019-12-191-11/+28
| | | | | | | | | | | | | | | | | Change the debug detection to match debug or release for anything except Msvc/ClangMsvc, effectively turning the check off. Msvc/ClangMsvc are the only remaining compilers for which distinct debug/release binaries are generated by debug-and-release due to the different runtimes. Fixes: QTBUG-80806 Task-number: QTBUG-80763 Task-number: QTBUG-78445 Change-Id: I85f170787c45a08cc28f37caa54e152dd7191e0f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* windeployqt: Refactor platform enumerationFriedemann Kleint2019-12-191-29/+23
| | | | | | | | | | | | | | | | | - Make it a QFlags, providing operators - Remove WinCE - Add a Msvc compiler flag and make the tests for build directory and d-suffix depending on it. - Add clang-Msvc/clang-MinGW - Rename WindowsDesktop to WindowsDesktopMsvc, WinRtIntel to WinRtIntelMsvc and WinRtArm to WinRtArmMsvc - Use QFlags::testFlag() Task-number: QTBUG-80806 Task-number: QTBUG-80763 Task-number: QTBUG-78445 Change-Id: I0dd74a7b03e9e6bee55d4234c12eec17d52ce0e2 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Fix MinGW deploymentFriedemann Kleint2019-12-131-5/+5
| | | | | | | | | | | | The platform no longer has a 'd' suffix for debug binaries (see qtbase/4d289edb14aeb4976218cc306bfc514e37521b82). Add a check. Fixes: QTBUG-80763 Task-number: QTBUG-78445 Change-Id: I8d4617e2111167a546fa172cbca78a656d233ee5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Don't patch QtCore when -feature-relocatable is enabledAlexandru Croitor2019-09-111-1/+2
| | | | | | | | | | | The reasons: 1) Patching is not needed anymore 2) It will fail in a Release build because the symbol windeployqt is looking for is optimized away. Task-number: QTBUG-15234 Change-Id: I930b5470f038778bf7e3aa8d82e5d11fccc9f001 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* windeployqt: Warn only in case patching of Qt5Core failsFriedemann Kleint2019-09-101-2/+4
| | | | | | | | | | | After qtbase/4ac872639ed0dd3ae6627e05bdda821f7d128500, can fail for relocatable builds: Unable to patch ...\Qt5Core.dll: Could not locate pattern "qt_prfxpath=" Task-number: QTBUG-15234 Change-Id: I6df337b369d5e4c461293193bfe1c63e08b7fd35 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* windeployqt: Add option to disable deployment of the Virtual KeyboardFriedemann Kleint2019-05-081-0/+21
| | | | | | | | Add option to suppress the plugin itself and its dependent plugin directory. Fixes: QTBUG-75272 Change-Id: I588e3842416939cd694f40d9b0d98d4773e06daa Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-121-0/+7
|\ | | | | | | Change-Id: Iff999e458326e9d620895f9e799a64c06a12185e
| * Make windeployqt cross-platform (again)Marius Kittler2019-02-061-0/+7
| | | | | | | | | | Change-Id: I58d3d37fcc4d9da5879000e999707b007c4a7b39 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-261-38/+41
|\| | | | | | | Change-Id: I4934e083cec185981081f8192c0f044d40961894
| * windeployqt: Fix clang warning about switch statementKai Koehne2019-01-231-0/+1
| | | | | | | | | | | | | | | | warning: unannotated fall-through between switch labels insert 'break;' to avoid fall-through Change-Id: I1aeae4233898a59eac9872485ec12cde2278ade5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * windeployqt: Use nullptr were applicableKai Koehne2019-01-221-37/+40
| | | | | | | | | | Change-Id: Ifb01b7fab32c99b3d6621cc83dba72955a3cad39 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * windeployqt: Remove unused methodKai Koehne2019-01-221-1/+0
| | | | | | | | | | Change-Id: I591d666936bd96a10730585aa904b8e44b5128a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-231-1/+1
| | | | | | | | | | Change-Id: Ia9258adbfed2b47e7c9d01354e23008d72566a4d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-181-0/+1
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf src/assistant/help/qhelpcollectionhandler.cpp Change-Id: If1408a5893bc9ade9088e01c00aab695eff131aa
| * windeployqt: Deploy the Qt Virtual Keyboard pluginsAndy Shaw2019-01-091-0/+1
| | | | | | | | | | | | | | | | The plugins contain some of the asian languages and handwriting plugins, so these need to be deployed as well. Change-Id: I16a03653daefb81c85907220ba50639bb3582df1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-041-86/+65
|\| | | | | | | | | | | | | | | | | Conflicts: src/qdoc/htmlgenerator.cpp src/qtattributionsscanner/qdocgenerator.cpp Done-With: Martin Smith <martin.smith@qt.io> Change-Id: I56a23175579a1a699939179da2f35bbcd6c73367
| * windeployqt: Replace typedef by usingFriedemann Kleint2018-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | Fix the respective Clang-tidy warning: utils.h:85: warning: use 'using' instead of 'typedef' [modernize-use-using] as displayed in the Qt Creator issues pane. Change-Id: Ide04ff3bc426ec55b9cdcc1b511119089d6750d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * windeployqt: Simplify enabled/disabled modules option parsingFriedemann Kleint2018-12-121-14/+14
| | | | | | | | | | | | | | | | Use a simple vector of and use the mask bit from the qtModules array. Change-Id: I233b5226cce8dfe91018830328c268cf1d16104e Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * windeployqt: Fix some Clang warningsFriedemann Kleint2018-12-121-41/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | - Use range-based for - Remove else after return - Use member initialization - Dubious check of bool * - Prefer static QFileInfo::exists() - Use uninitialized struct QJsonParseError Change-Id: If2705d6829ba3186cafb068a2c083943d33d1c66 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Enable Windeployqt to package arm64 desktop appsThomas Miller2018-12-071-12/+16
| | | | | | | | | | Change-Id: I8ef5ca54488e3e5cd89bd5a6e7be4958c74fe60d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * windeployqt: Remove unused methodKai Koehne2018-12-071-18/+0
| | | | | | | | | | | | | | Amends 88e02bb0a9b97d6 Change-Id: Ifd614a0cd985ac695817b257830aa07de8041ee4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Support qmlimport option in windeployqtIlya Bizyaev2018-10-181-1/+14
|/ | | | | | | | | | This patch adds a new option, -qmlimport, which enables windeployqt to pass custom QML module import paths to qmlimportscanner. Change-Id: Iacde05543ab1f8f85b8306661e4674ad24badce4 Fixes: QTBUG-71045 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-071-1/+1
|\ | | | | | | Change-Id: Ib748ab5563d69fa0e3a39a6234731becbc86b0d6
| * windeployqt: document verbosity levelsMitch Curtis2018-07-051-1/+1
| | | | | | | | | | | | | | | | | | Not knowing what to set them to makes them kinda useless. They are 0 to 2, based on the source code. Change-Id: I43b48614d99d26a9508326755b365f86aa087831 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-06-301-1/+3
|\| | | | | | | | | | | | | Conflicts: src/androiddeployqt/main.cpp Change-Id: I3df907e197b1b976f74562f1a9cce10261f166f3
| * windeployqt: Add support for Qt3DExtras moduleAndy Shaw2018-06-191-1/+3
| | | | | | | | | | Change-Id: Ie09a99f5d3c560768f6d284f0a8c7569aac11ea8 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-04-301-7/+5
|\| | | | | | | | | | | | | Conflicts: src/androiddeployqt/main.cpp Change-Id: Idb9f2420541ed8465f4a42cd8442bd469e6b5866
| * windeployqt: Improve detection of Qt librariesFriedemann Kleint2018-04-191-7/+5
| | | | | | | | | | | | | | | | | | | | Remove the special handling which is no longer relevant and check on the major version in addition. Task-number: QTBUG-67762 Change-Id: If9acabfb6c9d9f6ff1fccf91c98ddd540415ab49 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Rename Windows(MinGW) to WindowsDesktop(MinGW) in Platform enumOliver Wolff2018-04-061-8/+8
|/ | | | | | | | | | | When used in connection with a winrt related header (roerrorapi.h) having an enum value Windows will lead to a symbol redefinition error, because Windows is used as a namespace name in there. Change-Id: Ie102b0d7a72ffb01c3a97f5f5f51b1645d46342b Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* windeployqt: Add QtWebView moduleChristian Stromme2018-01-271-3/+6
| | | | | | | Add library and plugin directory. Change-Id: Ib232de3df5bc98b99ee237818ea7a521df5579f3 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-201-4/+9
|\ | | | | | | Change-Id: I5f715ea279e879b7f41278d6f70b8fa1e64eda52
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-181-4/+9
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia803aad211281c71a8d13b403d83fb5ec3b2cb2c
| | * windeployqt: Add deployment of the Qt3DAnimation dllSamuel Gaist2018-01-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windeployqt currently doesn't deploy the Qt3DAnimation dll when the module is used. This patch fixes this. [ChangeLog][Windows][deployment] The Qt3DAnimation dll is now deployed when the module is used. Change-Id: Ibff744192f6a3e028bb096e33f596cba948b229b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * windeployqt: Fix deployment of MSVC 2017 15.5 release redistributableFriedemann Kleint2017-12-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | The file name was changed. Task-number: QTBUG-65015 Change-Id: I0a81a42abae3bcf9b124acbea55ba4e275594016 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * windeployqt: winrt: Do not list translation files that are not deployedOliver Wolff2017-11-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio projects for winrt usage rely on a proper list of files that are deployed. We concat translation files into a single qt_<prefix>.qm file using lconvert, but also mention every "sub file" (qtbase_<prefix>.qm etc) in json. That breaks deployment on winrt and thus should not be done on that platform. Change-Id: I3086b923ce4703ec159202cfe8df9447cdd51571 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-111-1/+2
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ieef1b05234ee67bef28f2dc9abaa65f10840d21b
| * | windeployqt: winrt: Do not list translation files that are not deployedv5.10.0-rc3v5.10.0-rc2v5.10.0Oliver Wolff2017-11-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio projects for winrt usage rely on a proper list of files that are deployed. We concat translation files into a single qt_<prefix>.qm file using lconvert, but also mention every "sub file" (qtbase_<prefix>.qm etc) in json. That breaks deployment on winrt and thus should not be done on that platform. Change-Id: I3086b923ce4703ec159202cfe8df9447cdd51571 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit a134cb1855622694355d8564b2f6aa0b7bf08b29) Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-8/+21
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/qdoc/qdocdatabase.h Change-Id: I044c17d6a953c9689a4d928972d3fd757e468114
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-151-2/+2
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/qtattributionsscanner/main.cpp Change-Id: Idb919f217f1dea42728fd9318fd9f48d9c3d3f29
| | * windeployqt: Do not set translations' file name as target directoryOliver Wolff2017-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The target part of a json entry has to be a directory and not the final file name. Change-Id: I61c5649c61a3f539f58af7b636fc0ca1acb94c77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-5/+14
| |\| | | | | | | | | | Change-Id: I9069b01eb82dfcce33e2afae3be853f7a5bd1fa8
| | * windeployqt: Print list of translationsFriedemann Kleint2017-10-161-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the options struct to deployTranslations() and add the files to JsonOutput. Task-number: QTBUG-63744 Change-Id: Ie1d8587cbeb22acc2fdcfba6e666059e3936c708 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-151-3/+7
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/examples.pro Change-Id: I1b10716619d6a07466db9d5407a958062e7cd38a
| | * windeployqt: Do not use debug redistributable files from "onecore" on Windows 7Friedemann Kleint2017-10-111-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | They require Windows 10. Amends 061e1a8bbe5fb05b8f85811d55e805f54327d1d6. Task-number: QTBUG-63676 Change-Id: I32d94bf3d52616fc0d5c861a6a7444d8b8e61cdf Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-271-2/+2
|/ / | | | | | | | | Change-Id: I14c2c689102229579aaab2dd9999434a4e251d20 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-171-2/+7
|\| | | | | | | Change-Id: I05937dcc25c64b90c16818eda31b888bd6611e51
| * Install missing qtwebengine_devtools_resources.pak file for WebEngineAlexandru Croitor2017-08-141-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-59251 Change-Id: I1e1b3c3301755aaabcccb85af1ca1b2dee52a59b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * windeployqt: Check folder "onecore" for MSVC debug redistributable filesFriedemann Kleint2017-07-271-1/+4
| | | | | | | | | | | | | | | | | | It seems to be required depending on MSVC edition and installed toolchains. Task-number: QTBUG-61549 Change-Id: Iae800e9f37f1ca301731011e72f8d3223f3585c1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * windeployqt: Deploy the geometryloaders plugins for Qt3DRenderAndy Shaw2017-07-241-1/+2
| | | | | | | | | | Change-Id: Ibf296ae7ccb4373512298eef7cfd92b21891af76 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 10:59:10 +0000