diff options
| author | Marius Kittler <mariuskittler@gmx.de> | 2019-02-03 17:40:35 +0100 |
|---|---|---|
| committer | Marius Kittler <mariuskittler@gmx.de> | 2019-02-06 14:03:07 +0000 |
| commit | 536c58c55641f2b93c95aa38d2893385f412786d (patch) | |
| tree | d85c18d7cd1d4bb4d9aeab8d6e82b770a1a9b24e | |
| parent | d264cde2c754a683a723a2b5aad9b634a07eea21 (diff) | |
| download | qttools-536c58c55641f2b93c95aa38d2893385f412786d.tar.gz | |
Make windeployqt cross-platform (again)
Change-Id: I58d3d37fcc4d9da5879000e999707b007c4a7b39
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -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 da61f9b88..d00707470 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> @@ -1102,6 +1107,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()) @@ -1141,6 +1147,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned result.append(redistFiles); } break; +#endif // Q_OS_WIN default: break; } |