diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 03:01:47 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 03:01:47 +0100 |
| commit | be187fbdc65b41531eee7fed63567d6d05f58b52 (patch) | |
| tree | 07f7f0db975b93dc49184c270e0cddd337e98fd1 /src/windeployqt/main.cpp | |
| parent | 2055c451f8ff2b2f5e7de105454790d7b240a6b3 (diff) | |
| parent | 802aa37f7725ca3d75d1e928d845c6df534943ba (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iff999e458326e9d620895f9e799a64c06a12185e
Diffstat (limited to 'src/windeployqt/main.cpp')
| -rw-r--r-- | src/windeployqt/main.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 2266e84da..f3c0e5fd7 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -40,7 +40,12 @@ #include <QtCore/QOperatingSystemVersion> #include <QtCore/QSharedPointer> #include <QtCore/QVector> + +#ifdef Q_OS_WIN #include <QtCore/qt_windows.h> +#else +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 +#endif #include <algorithm> #include <iostream> @@ -1111,6 +1116,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned result.append(dllFi.absoluteFilePath()); } break; +#ifdef Q_OS_WIN case WindowsDesktop: { // MSVC/Desktop: Add redistributable packages. QString vcRedistDirName = vcRedistDir(); if (vcRedistDirName.isEmpty()) @@ -1150,6 +1156,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned result.append(redistFiles); } break; +#endif // Q_OS_WIN default: break; } |