mirror of https://git.wownero.com/dsc/mxe.git
package qtifw: update to 3.1.1, build test
This commit is contained in:
Martin Müllenhaupt
mabrand
parent
aae03b205f
commit
e479e87b0e
|
|
@ -4,73 +4,73 @@ diff --git a/installerfw.pro b/installerfw.pro
|
|||
index 10414ad5..1cec9c6a 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)
|
||||
|
||||
@@ -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 715de250..bfb65a34 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 <NTSecAPI.h>
|
||||
+#include <ntsecapi.h>
|
||||
|
||||
#include "Defs.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#ifndef __WINDOWS_SECURITY_UTILS_H
|
||||
#define __WINDOWS_SECURITY_UTILS_H
|
||||
|
||||
-#include <NTSecAPI.h>
|
||||
+#include <ntsecapi.h>
|
||||
|
||||
#include "Defs.h"
|
||||
|
||||
diff --git a/src/libs/installer/createshortcutoperation.cpp b/src/libs/installer/createshortcutoperation.cpp
|
||||
index 2c2e96ef..36f97b0c 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 <qt_windows.h>
|
||||
#include <shlobj.h>
|
||||
-#include <Intshcut.h>
|
||||
+#include <intshcut.h>
|
||||
|
||||
#ifndef PIDLIST_ABSOLUTE
|
||||
typedef ITEMIDLIST *PIDLIST_ABSOLUTE;
|
||||
@@ -41,7 +41,7 @@ using namespace QInstaller;
|
||||
#ifdef Q_OS_WIN
|
||||
#include <qt_windows.h>
|
||||
#include <shlobj.h>
|
||||
-#include <Intshcut.h>
|
||||
+#include <intshcut.h>
|
||||
|
||||
#ifndef PIDLIST_ABSOLUTE
|
||||
typedef ITEMIDLIST *PIDLIST_ABSOLUTE;
|
||||
diff --git a/src/libs/installer/binaryformat.h b/src/libs/installer/binaryformat.h
|
||||
index 3bd8a6aa..87d5e323 100644
|
||||
--- a/src/libs/installer/binaryformat.h
|
||||
+++ b/src/libs/installer/binaryformat.h
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "range.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
-#include <QtCore/private/qfsfileengine_p.h>
|
||||
+#include <QtCore/QFile>
|
||||
#include <QList>
|
||||
#include <QSharedPointer>
|
||||
|
||||
@@ -81,7 +81,7 @@ private:
|
||||
void setOpenMode(OpenMode mode) { QIODevice::setOpenMode(mode); }
|
||||
|
||||
private:
|
||||
- QFSFileEngine m_file;
|
||||
+ QFile m_file;
|
||||
QByteArray m_name;
|
||||
Range<qint64> m_segment;
|
||||
};
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "range.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
-#include <QtCore/private/qfsfileengine_p.h>
|
||||
+#include <QtCore/QFile>
|
||||
#include <QList>
|
||||
#include <QSharedPointer>
|
||||
|
||||
@@ -81,7 +81,7 @@ private:
|
||||
void setOpenMode(OpenMode mode) { QIODevice::setOpenMode(mode); }
|
||||
|
||||
private:
|
||||
- QFSFileEngine m_file;
|
||||
+ QFile m_file;
|
||||
QByteArray m_name;
|
||||
Range<qint64> m_segment;
|
||||
};
|
||||
diff --git a/src/libs/installer/extractarchiveoperation_p.h b/src/libs/installer/extractarchiveoperation_p.h
|
||||
index f333da36..9f528b6a 100644
|
||||
--- a/src/libs/installer/extractarchiveoperation_p.h
|
||||
+++ b/src/libs/installer/extractarchiveoperation_p.h
|
||||
@@ -37,6 +37,8 @@
|
||||
|
||||
#include <QRunnable>
|
||||
#include <QThread>
|
||||
+#include <QFileInfo>
|
||||
+#include <QDir>
|
||||
|
||||
namespace QInstaller {
|
||||
|
||||
@@ -37,6 +37,8 @@
|
||||
|
||||
#include <QRunnable>
|
||||
#include <QThread>
|
||||
+#include <QFileInfo>
|
||||
+#include <QDir>
|
||||
|
||||
namespace QInstaller {
|
||||
|
||||
|
|
|
|||
13
src/qtifw.mk
13
src/qtifw.mk
|
|
@ -4,11 +4,11 @@ PKG := qtifw
|
|||
$(PKG)_WEBSITE := https://doc.qt.io/qtinstallerframework/index.html
|
||||
$(PKG)_DESCR := Qt Installer Framework
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 3.0.4
|
||||
$(PKG)_CHECKSUM := a4ecafc37086f96a833463214f873caac977199e64f0b1453aa49bdd6f24f32e
|
||||
$(PKG)_SUBDIR = qt-installer-framework-opensource-src-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $($(PKG)_SUBDIR).zip
|
||||
$(PKG)_URL := https://download.qt.io/official_releases/qt-installer-framework/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||
$(PKG)_VERSION := 3.1.1
|
||||
$(PKG)_CHECKSUM := 59b5370aaf521bb1a34a025ac451bb3bbbfa519ee271156aba9d42ee1132d1b1
|
||||
# the archive is in fact only a tar file, not a tar.gz
|
||||
$(PKG)_FILE := qtifw-$($(PKG)_VERSION).tar
|
||||
$(PKG)_URL := https://download.qt.io/official_releases/qt-installer-framework/$($(PKG)_VERSION)/qt-installer-framework-opensource-src-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
|
||||
|
||||
$(PKG)_DEPS_$(BUILD) := cc qtbase qttools
|
||||
|
|
@ -28,4 +28,7 @@ define $(PKG)_BUILD_STATIC
|
|||
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j 1
|
||||
$(MAKE) -C '$(1)' -j 1 install
|
||||
|
||||
# build the tutorial installer in /tmp, because the binarycreator internal rename will fail if /tmp is not in the same filesystem as mxe
|
||||
cd '$(1)examples/tutorial' && '$(PREFIX)/bin/$(BUILD)-binarycreator' -c config/config.xml -p packages -t $(PREFIX)/$(TARGET)/qt5/bin/installerbase.exe /tmp/test-$(PKG)-tutorialinstaller.exe && mv /tmp/test-$(PKG)-tutorialinstaller.exe $(PREFIX)/$(TARGET)/bin/test-$(PKG)-tutorialinstaller.exe
|
||||
endef
|
||||
|
|
|
|||
Loading…
Reference in New Issue