diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-18 12:11:16 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-19 10:34:55 +0100 |
| commit | d0394e74e7c34012c3f520a3c3e4a2008911aa6f (patch) | |
| tree | c9ebc762ce18a333932884cd6cfc79b17ec7c756 /src/shared/winutils/qmlutils.cpp | |
| parent | edba18247d7e3713ee8051469874ad323c090ff3 (diff) | |
windeployqt: Refactor platform enumeration
- 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>
Diffstat (limited to 'src/shared/winutils/qmlutils.cpp')
| -rw-r--r-- | src/shared/winutils/qmlutils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/winutils/qmlutils.cpp b/src/shared/winutils/qmlutils.cpp index 6e8d5192b..54e470105 100644 --- a/src/shared/winutils/qmlutils.cpp +++ b/src/shared/winutils/qmlutils.cpp @@ -73,12 +73,12 @@ static QString qmlDirectoryRecursion(Platform platform, const QString &path) } // Find a directory containing QML files in the project -QString findQmlDirectory(int platform, const QString &startDirectoryName) +QString findQmlDirectory(Platform platform, const QString &startDirectoryName) { QDir startDirectory(startDirectoryName); - if (isBuildDirectory(Platform(platform), startDirectory.dirName())) + if (isBuildDirectory(platform, startDirectory.dirName())) startDirectory.cdUp(); - return qmlDirectoryRecursion(Platform(platform), startDirectory.path()); + return qmlDirectoryRecursion(platform, startDirectory.path()); } static void findFileRecursion(const QDir &directory, Platform platform, |