summaryrefslogtreecommitdiffstats
path: root/src/shared/winutils/utils.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove macdeployqt and windeployqtJoerg Bornemann2021-11-261-1006/+0
| | | | | | | | | | | These tools have been moved to qtbase. Change-Id: Idaf799d44be399040f9058252675c0ee3eecc39b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* windeployqt: Replace qmake querying with qtpathsKai Köhne2021-11-101-2/+2
| | | | | | | | | | | | | | We want to make qmake optional mid-term. Therefore, qtpaths in Qt 6.2 got the same '-query' functionality. Use that by default in windeployqt. [ChangeLog][Build Tools] windeployqt now uses qtpaths.exe instead of qmake.exe to query paths related to the Qt installation. This is also reflected in a new -qtpaths command line argument, which replaces the -query argument. Change-Id: I36c75c0fd0f3c50ea5dce74eb2cf6d78ab074824 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* winutils: Remove unused methodKai Köhne2021-10-211-18/+0
| | | | | Change-Id: Icc6e8988b0a6a2fddfc6f2d8b8a7386d132d2fc0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Windows utils: Remove runElevatedBackgroundProcess()Friedemann Kleint2020-11-121-39/+0
| | | | | | | It was used by winrtrunner. Change-Id: If24d854c6ba0514c464aa49acbe99c1a0def7fa4 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Add optional qmake parameterOliver Wolff2020-09-161-2/+2
| | | | | | | | | | | In a crosscompilation setup (for example Windows arm64) windeployqt will pick up the wrong Qt libraries. At the moment qmake is the only way to determine information about the Qt build even if cmake was used to build Qt. By passing the path to the proper qmake, windeployqt will deploy the correct libraries for the build. Change-Id: I14992b1c27cce774440fa16abcc2abb30bec641a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix MSVC runtime detection for WinRT debug binariesPaweł Wegner2020-06-031-1/+1
| | | | | | | | | | | Prior to the fix if the app depends on any library with 'app' substring in the name the build will always be detected as release. For example WinRT apps which depend on vccorlib_app library will always be detected as release. Change-Id: Ib17376962f3d5120211338b4baa08a431a226dd7 Pick-to: 5.15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix build because can't convert ushort* to const char16_t *Liang Qi2020-05-181-1/+1
| | | | | Change-Id: Ibf201379fc025cccf919bc2de9235db12e1c3eff Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* windeployqt: Refactor platform enumerationFriedemann Kleint2019-12-191-3/+4
| | | | | | | | | | | | | | | | | - 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 debug detection of "_app" versions of MSVC runtimeOliver Wolff2019-12-191-0/+3
| | | | | | | | | | UWP targets have the naming scheme of VCRUNTIMEXXX(d)_APP.dll. The "_APP" part, which is also mentioned in the comment, has to be taken into account when looking for the d "suffix" of the runtime library. Change-Id: Iea84687c7c3f230ac9520ca983e742b0938eec15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jiong Chang <xspeed1989@gmail.com>
* windeployqt: Fix MinGW deploymentFriedemann Kleint2019-12-131-1/+1
| | | | | | | | | | | | 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>
* windeployqt: Fix detection of MSVC runtimeJiong Chang2019-11-211-7/+6
| | | | | | | | Detect msvcrt.dll without version number Change-Id: Ifafdc79c1b6497e1f6695b9c69d9d9fdd6cc2d94 Reviewed-by: Yuhang Zhao <2546789017@qq.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* windeployqt: Do not patch Qt5Core.dll unless necessaryFriedemann Kleint2019-11-051-7/+12
| | | | | | | | | | Check whether the content is already is patched to avoid unnecessarily touching files. Fixes: QTBUG-78732 Change-Id: I061927e8908793b78211b4634c3dc772c12c7915 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* windeployqt: Fix some Clang warningsFriedemann Kleint2018-12-121-4/+2
| | | | | | | | | | | | | - 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-2/+24
| | | | | Change-Id: I8ef5ca54488e3e5cd89bd5a6e7be4958c74fe60d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* winutils: Fix MinGW warnings about missing struct members initializersFriedemann Kleint2018-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix warnings: ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::hwnd' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpVerb' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpFile' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpParameters' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpDirectory' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::nShow' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::hInstApp' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpIDList' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpClass' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::hkeyClass' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::dwHotKey' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::<anonymous>' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::hProcess' [-Wmissing-f Use a default initializer. Change-Id: I0c6852093e7efa97ac0492012677d77a5e04190e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* winutils: Add possibility to run elevated background processesOliver Wolff2018-04-061-0/+39
| | | | | | | | | | | | | | | In order to add localhost server support for winrt applications, we need to be able to run elevated applications in the background. As a preparation for this next patch, the new function is introduced. As winrtrunner is not supported on OSs other than Windows, it is fine to omit the implementation of this function on these operating systems for now. Change-Id: Iedb74a391e07a2b637f13bef84ad50c746dd8f0a Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Rename Windows(MinGW) to WindowsDesktop(MinGW) in Platform enumOliver Wolff2018-04-061-1/+1
| | | | | | | | | | | 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>
* Move windows utilities into shared folderOliver Wolff2018-04-061-0/+996
An upcoming patch for winrtrunner will need to run an external executable. The utilities are moved to the shared folder to avoid code duplication Change-Id: I2be575432626ef796a6ebc95e55ac30ab3631b61 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 01:47:00 +0000