This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 19 Jan 2020 13:27:42 +1100 Subject: [PATCH 1/1] fixes diff --git a/installerfw.pro b/installerfw.pro index 1111111..2222222 100644 --- a/installerfw.pro +++ b/installerfw.pro @@ -2,8 +2,6 @@ TEMPLATE = subdirs SUBDIRS += src tools tools.depends = src -requires(!cross_compile) - include (installerfw.pri) include (doc/doc.pri) diff --git a/src/libs/7zip/win/CPP/Windows/SecurityUtils.h b/src/libs/7zip/win/CPP/Windows/SecurityUtils.h index 1111111..2222222 100644 --- a/src/libs/7zip/win/CPP/Windows/SecurityUtils.h +++ b/src/libs/7zip/win/CPP/Windows/SecurityUtils.h @@ -3,7 +3,7 @@ #ifndef __WINDOWS_SECURITY_UTILS_H #define __WINDOWS_SECURITY_UTILS_H -#include +#include #include "Defs.h" diff --git a/src/libs/installer/binaryformat.h b/src/libs/installer/binaryformat.h index 1111111..2222222 100644 --- a/src/libs/installer/binaryformat.h +++ b/src/libs/installer/binaryformat.h @@ -33,7 +33,7 @@ #include "range.h" #include -#include +#include #include #include @@ -81,7 +81,7 @@ private: void setOpenMode(OpenMode mode) { QIODevice::setOpenMode(mode); } private: - QFSFileEngine m_file; + QFile m_file; QByteArray m_name; Range m_segment; }; diff --git a/src/libs/installer/createshortcutoperation.cpp b/src/libs/installer/createshortcutoperation.cpp index 1111111..2222222 100644 --- a/src/libs/installer/createshortcutoperation.cpp +++ b/src/libs/installer/createshortcutoperation.cpp @@ -41,7 +41,7 @@ using namespace QInstaller; #ifdef Q_OS_WIN #include #include -#include +#include #ifndef PIDLIST_ABSOLUTE typedef ITEMIDLIST *PIDLIST_ABSOLUTE; diff --git a/src/libs/installer/extractarchiveoperation_p.h b/src/libs/installer/extractarchiveoperation_p.h index 1111111..2222222 100644 --- a/src/libs/installer/extractarchiveoperation_p.h +++ b/src/libs/installer/extractarchiveoperation_p.h @@ -37,6 +37,8 @@ #include #include +#include +#include namespace QInstaller {