mirror of https://git.wownero.com/dsc/mxe.git
upgrade qt5 modules to 5.8.0
This commit is contained in:
parent
a0f9e61502
commit
0f724ee4b3
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea
|
||||
$(PKG)_CHECKSUM := 3a224576fc922195ac0063b5b351cd6b9d13afcde9cec14317be0347d10c8ae5
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qt3d,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qt3d,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qt3d,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 0c09920de273fa12e40f6486a4715267e2fe54991303b6ddfdac69fe9a24a1d5
|
||||
$(PKG)_CHECKSUM := 927a415713095864ee800181ff55a56c5fbedf4bd0e7a6241d55dc0ad94135a9
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL))
|
||||
|
|
|
@ -1,132 +1,9 @@
|
|||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
From 62efa18a61560a7757acffbd4ac6ca7b153155cc Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 6 Aug 2015 23:35:08 +0200
|
||||
Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE
|
||||
specific)
|
||||
|
||||
Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4
|
||||
|
||||
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
|
||||
index 39280de..e152b0d 100644
|
||||
--- a/src/3rdparty/freetype_dependency.pri
|
||||
+++ b/src/3rdparty/freetype_dependency.pri
|
||||
@@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) {
|
||||
} else:contains(QT_CONFIG, system-freetype) {
|
||||
# pull in the proper freetype2 include directory
|
||||
include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
|
||||
+ win32:shared:LIBS_PRIVATE += -lfreetype
|
||||
}
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
From 5a15e0374758b7786204d98b66f49b4fd3daea79 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sat, 21 Jun 2014 13:12:49 +0200
|
||||
Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific)
|
||||
|
||||
Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
|
||||
|
||||
diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro
|
||||
index 32edd6e..a7f2c28 100644
|
||||
--- a/config.tests/unix/harfbuzz/harfbuzz.pro
|
||||
+++ b/config.tests/unix/harfbuzz/harfbuzz.pro
|
||||
@@ -1,3 +1,4 @@
|
||||
SOURCES = harfbuzz.cpp
|
||||
CONFIG -= qt dylib
|
||||
-LIBS += -lharfbuzz
|
||||
+CONFIG += link_pkgconfig
|
||||
+PKGCONFIG += harfbuzz
|
||||
diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
|
||||
index 7443368..c24e684 100644
|
||||
--- a/src/3rdparty/harfbuzz_dependency.pri
|
||||
+++ b/src/3rdparty/harfbuzz_dependency.pri
|
||||
@@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) {
|
||||
INCLUDEPATH += $$PWD/harfbuzz-ng/include
|
||||
LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix()
|
||||
} else:contains(QT_CONFIG, system-harfbuzz) {
|
||||
- LIBS_PRIVATE += -lharfbuzz
|
||||
+ CONFIG += link_pkgconfig
|
||||
+ PKGCONFIG += harfbuzz
|
||||
}
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
From bc002ee2a8418c7afcba362d155ba1a591bc3d1a Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon, 8 Dec 2014 14:15:12 +0100
|
||||
Subject: [PATCH 3/8] fix oci config test on windows
|
||||
|
||||
Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
|
||||
|
||||
diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
|
||||
index 3ffda1d..39b6f3759 100644
|
||||
--- a/config.tests/unix/oci/oci.pro
|
||||
+++ b/config.tests/unix/oci/oci.pro
|
||||
@@ -1,3 +1,3 @@
|
||||
SOURCES = oci.cpp
|
||||
CONFIG -= qt dylib
|
||||
-LIBS += -lclntsh
|
||||
+!win32:LIBS += -lclntsh
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
From 92d2ae7b6eb175b4f15e5f0f231a9c29824d6f57 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 6 Aug 2015 13:24:56 +0200
|
||||
Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
|
||||
|
||||
Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index ba94d08..50e6dfb 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4677,7 +4677,7 @@ fi
|
||||
[ "$XPLATFORM_ANDROID" != "no" ] && QMakeVar add styles "android"
|
||||
|
||||
# check IPC support
|
||||
-if ! compileTest unix/ipc_sysv "ipc_sysv" ; then
|
||||
+if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then
|
||||
# SYSV IPC is not supported - check POSIX IPC
|
||||
if compileTest unix/ipc_posix "ipc_posix" ; then
|
||||
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
From f0054e940467a64dffc0c3cc070233fdf2848d43 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Tue, 6 Oct 2015 09:53:20 +0200
|
||||
Subject: [PATCH 5/8] fix building mysql driver under mingw
|
||||
|
||||
Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
|
||||
|
||||
diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
|
||||
index 3cfb614..8b7063f 100644
|
||||
--- a/src/sql/drivers/mysql/qsql_mysql.pri
|
||||
+++ b/src/sql/drivers/mysql/qsql_mysql.pri
|
||||
@@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp
|
||||
QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
|
||||
LIBS += $$QT_LFLAGS_MYSQL
|
||||
|
||||
-unix {
|
||||
+if (unix|mingw) {
|
||||
isEmpty(QT_LFLAGS_MYSQL) {
|
||||
!contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
|
||||
use_libmysqlclient_r:LIBS += -lmysqlclient_r
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
From 26229596fbb711bc222c831eca3a9e5b62c7acc6 Mon Sep 17 00:00:00 2001
|
||||
From 12eed60ff166200c12d203d0daaa6c58c41df0ea Mon Sep 17 00:00:00 2001
|
||||
From: Ray Donnelly <mingw.android@gmail.com>
|
||||
Date: Wed, 26 Aug 2015 12:45:43 +0100
|
||||
Subject: [PATCH 6/8] cmake: Rearrange STATIC vs INTERFACE targets
|
||||
Subject: [PATCH 1/5] cmake: Rearrange STATIC vs INTERFACE targets
|
||||
|
||||
Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
|
||||
for header-only modules when building Qt5 statically.
|
||||
|
@ -159,10 +36,10 @@ index d2358ca..6b1dc95 100644
|
|||
2.9.3
|
||||
|
||||
|
||||
From 59fd7fdff5bf0cda3c7a11982ee96f50d8eddec1 Mon Sep 17 00:00:00 2001
|
||||
From 9d8bca4d8c1d312cca4b161c93a091147dd7aa37 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Sat, 16 Jul 2016 20:31:07 +1000
|
||||
Subject: [PATCH 7/8] Fix pkgconfig file and library naming
|
||||
Subject: [PATCH 2/5] Fix pkgconfig file and library naming
|
||||
|
||||
See: https://codereview.qt-project.org/#/c/165394/
|
||||
https://bugreports.qt.io/browse/QTBUG-30898
|
||||
|
@ -187,10 +64,10 @@ Task-number: 30898
|
|||
Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644
|
||||
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index d9011f5..1993a7f 100644
|
||||
index 31d6285..8e24520 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -244,6 +244,10 @@ load(qt_installs)
|
||||
@@ -248,6 +248,10 @@ load(qt_installs)
|
||||
|
||||
load(qt_targets)
|
||||
|
||||
|
@ -201,7 +78,7 @@ index d9011f5..1993a7f 100644
|
|||
# this builds on top of qt_common
|
||||
!internal_module:!lib_bundle:if(unix|mingw) {
|
||||
CONFIG += create_pc
|
||||
@@ -254,12 +258,12 @@ load(qt_targets)
|
||||
@@ -258,12 +262,12 @@ load(qt_targets)
|
||||
QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
|
||||
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
|
||||
QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME
|
||||
|
@ -218,7 +95,7 @@ index d9011f5..1993a7f 100644
|
|||
pclib_replace.match = $$lib_replace.match
|
||||
!isEmpty(lib_replace.replace): \
|
||||
pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
|
||||
@@ -293,5 +297,3 @@ win32 {
|
||||
@@ -297,5 +301,3 @@ win32 {
|
||||
# On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API
|
||||
DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000
|
||||
}
|
||||
|
@ -228,26 +105,90 @@ index d9011f5..1993a7f 100644
|
|||
2.9.3
|
||||
|
||||
|
||||
From a2ed2c9fe74b549cb163f89a56df6eec3af553fa Mon Sep 17 00:00:00 2001
|
||||
From e4da2904bcab29d15ad137508390bec0595c0e72 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 15 Dec 2016 17:20:56 +0100
|
||||
Subject: [PATCH 8/8] fix mysql config test
|
||||
Date: Sun, 29 Jan 2017 13:02:16 +0100
|
||||
Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific)
|
||||
|
||||
The config test already gets link flags which should include
|
||||
the library. Blindly adding it to the end of the list can break
|
||||
static linking.
|
||||
Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f
|
||||
|
||||
Change-Id: Ief71c4ad64cbbb1b141b0ef5549f42a36bbd125b
|
||||
|
||||
diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro
|
||||
index 06d1880..ca6d6aa 100644
|
||||
--- a/config.tests/unix/mysql/mysql.pro
|
||||
+++ b/config.tests/unix/mysql/mysql.pro
|
||||
@@ -1,3 +1,3 @@
|
||||
SOURCES = mysql.cpp
|
||||
CONFIG -= qt dylib
|
||||
-LIBS += -lmysqlclient
|
||||
+LIBS *= -lmysqlclient
|
||||
diff --git a/src/gui/configure.json b/src/gui/configure.json
|
||||
index 1f50116..dd94429 100644
|
||||
--- a/src/gui/configure.json
|
||||
+++ b/src/gui/configure.json
|
||||
@@ -471,7 +471,7 @@
|
||||
},
|
||||
"fontconfig": {
|
||||
"label": "Fontconfig",
|
||||
- "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig",
|
||||
+ "condition": "!config.darwin && features.system-freetype && libs.fontconfig",
|
||||
"output": [ "privateFeature", "feature" ]
|
||||
},
|
||||
"gbm": {
|
||||
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
|
||||
index 03c7250..7d0ffbd 100644
|
||||
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
|
||||
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
|
||||
@@ -120,7 +120,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
|
||||
if (m_options & EnableFonts) {
|
||||
#if QT_CONFIG(fontconfig)
|
||||
if (!m_fontDatabase)
|
||||
+#ifdef Q_OS_WIN
|
||||
+ m_fontDatabase = new QBasicFontDatabase;
|
||||
+#else
|
||||
m_fontDatabase = new QGenericUnixFontDatabase;
|
||||
+#endif
|
||||
#else
|
||||
return QPlatformIntegration::fontDatabase();
|
||||
#endif
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
From db3c6f5fecb9b93f3553273576954d363d0630bc Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sun, 29 Jan 2017 14:00:06 +0100
|
||||
Subject: [PATCH 4/5] fix included file name case
|
||||
|
||||
Change-Id: I026787441aa43128aec001cfe1a7bc8d37799826
|
||||
|
||||
diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp
|
||||
index 977bbfd..12cccd1 100644
|
||||
--- a/src/plugins/platforms/windows/qwin10helpers.cpp
|
||||
+++ b/src/plugins/platforms/windows/qwin10helpers.cpp
|
||||
@@ -57,7 +57,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef HAS_UI_VIEW_SETTINGS_INTEROP
|
||||
-# include <UIViewSettingsInterop.h>
|
||||
+# include <uiviewsettingsinterop.h>
|
||||
#endif
|
||||
|
||||
#ifndef HAS_UI_VIEW_SETTINGS_INTEROP
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
From ddf845adb0080016c2f69fcfa7e23edf70e5151a Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sun, 29 Jan 2017 16:22:03 +0100
|
||||
Subject: [PATCH 5/5] fix treatment of SYBASE_LIBS
|
||||
|
||||
Change-Id: I4c9914cf7ef9d91feb0718a57f2551c1eeed47e0
|
||||
|
||||
diff --git a/src/sql/configure.pri b/src/sql/configure.pri
|
||||
index 1d8847b..229b6a1 100644
|
||||
--- a/src/sql/configure.pri
|
||||
+++ b/src/sql/configure.pri
|
||||
@@ -76,7 +76,7 @@ defineTest(qtConfLibrary_sybaseEnv) {
|
||||
libs += "-L$${sybase}/lib"
|
||||
libs += $$getenv(SYBASE_LIBS)
|
||||
!isEmpty(libs) {
|
||||
- $${1}.libs = "$$val_escape(libs)"
|
||||
+ $${1}.libs = $$libs
|
||||
export($${1}.libs)
|
||||
}
|
||||
return(true)
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
|
@ -4,15 +4,15 @@ PKG := qtbase
|
|||
$(PKG)_WEBSITE := http://qt-project.org/
|
||||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 5.7.1
|
||||
$(PKG)_CHECKSUM := edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e
|
||||
$(PKG)_VERSION := 5.8.0
|
||||
$(PKG)_CHECKSUM := c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005
|
||||
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
|
||||
$(PKG)_URL := http://download.qt.io/official_releases/qt/5.8/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre postgresql sqlite zlib
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
$(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.5/ | \
|
||||
$(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.8/ | \
|
||||
$(SED) -n 's,.*href="\(5\.[0-9]\.[^/]*\)/".*,\1,p' | \
|
||||
grep -iv -- '-rc' | \
|
||||
sort |
|
||||
|
@ -25,6 +25,9 @@ define $(PKG)_BUILD
|
|||
OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
|
||||
PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl pthreads` -lws2_32" \
|
||||
SYBASE_LIBS="-lsybdb `'$(TARGET)-pkg-config' --libs-only-l gnutls` -liconv -lws2_32" \
|
||||
PKG_CONFIG="${TARGET}-pkg-config" \
|
||||
PKG_CONFIG_SYSROOT_DIR="/" \
|
||||
PKG_CONFIG_LIBDIR="$(PREFIX)/$(TARGET)/lib/pc" \
|
||||
./configure \
|
||||
-opensource \
|
||||
-c++std c++11 \
|
||||
|
@ -32,6 +35,7 @@ define $(PKG)_BUILD
|
|||
-xplatform win32-g++ \
|
||||
-device-option CROSS_COMPILE=${TARGET}- \
|
||||
-device-option PKG_CONFIG='${TARGET}-pkg-config' \
|
||||
-pkg-config \
|
||||
-force-pkg-config \
|
||||
-no-use-gold-linker \
|
||||
-release \
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4
|
||||
$(PKG)_CHECKSUM := 5446f790f526f582df7790e1e1442357f61aac9c23ea9b00d4a791c9d78ccaa3
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtcanvas3d,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtcanvas3d,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3
|
||||
$(PKG)_CHECKSUM := 03e8acbe6d0a1ea421b28aba3e171648ec833381e6991f6617dfdcd85d78a586
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtcharts,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtcharts,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtcharts,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966
|
||||
$(PKG)_CHECKSUM := 7b2d01e9d67f6390a9e64bdae62e81a965b0f0b21137cf1a021e08a28bb227f1
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8
|
||||
$(PKG)_CHECKSUM := 77f1e7698cc2bade94183d05cf4c879a1c9c12ca6aedc565ee29df638d6b5bd8
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtdatavis3d,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtdatavis3d,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtdatavis3d,$(qtbase_URL))
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
# This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
PKG := qtdeclarative-render2d
|
||||
$(PKG)_WEBSITE := http://qt-project.org/
|
||||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtdeclarative-render2d,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtdeclarative-render2d,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtdeclarative-render2d,$(qtbase_URL))
|
||||
$(PKG)_DEPS := gcc qtbase qtdeclarative
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
echo $(qtbase_VERSION)
|
||||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)'
|
||||
$(MAKE) -C '$(1)' -j 1 install
|
||||
endef
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56
|
||||
$(PKG)_CHECKSUM := 32941eb9ad12d8735dfc64de8b50b5ab830a6d8705a421c57369de7cb5708a46
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182
|
||||
$(PKG)_CHECKSUM := b2f0ae3cda03942ad7971cfeebd0dd7e64faa24320104892f90220080cce8c37
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtgamepad,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtgamepad,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtgamepad,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8
|
||||
$(PKG)_CHECKSUM := 5f2a9b50530ac83d7c2b2ce73fbdf03ac61f83a9521e9d4b796fa17a969dd919
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4
|
||||
$(PKG)_CHECKSUM := 75045eeac11c96194260badbdb4d3e9eb7b7f9972d18d3491230ea820be4606f
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f
|
||||
$(PKG)_CHECKSUM := 48a1e39ed989f0133aeacaa379e9c3958ec9b08c043626bba503619891d21abb
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def
|
||||
$(PKG)_CHECKSUM := a8bc044834f95208261915feefe5e2fdb6761b76f0f99e21062963bd9f9d4a07
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := f694757929cefa31643daab4bde1fbda8d76c79eda0ee6094e1d86efd4cb7b42
|
||||
$(PKG)_CHECKSUM := b3fd8793525f4e3bf354db927e8b4c9ba1157ae080f2e16afa9a85eec7e1b355
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtpurchasing,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtpurchasing,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtpurchasing,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d
|
||||
$(PKG)_CHECKSUM := 04e70d0ccfd9ba882691a5e8f81e3428ae1b72a76bb9f43ba242f1c33bd7b326
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec
|
||||
$(PKG)_CHECKSUM := b099866ec74f13cf0047274c61f0486d1eba27716fa07b69f682c54d3a4ade1b
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols2,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtquickcontrols2,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtquickcontrols2,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426
|
||||
$(PKG)_CHECKSUM := 293ab91d2d189d889dc80609aa259190fb7de636d360e904784a5ce1a45e5ad3
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c
|
||||
$(PKG)_CHECKSUM := b6bb9d397396e7e2667d400c4d904d2d1dd9c1573c37ebe1aa62448289a09dc4
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtscxml,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtscxml,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtscxml,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10
|
||||
$(PKG)_CHECKSUM := 3a5d0639ecf8cd30c8ca349c353a8f3c424889b53831e70b6d8c481fc45de796
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157
|
||||
$(PKG)_CHECKSUM := 58343dd9f2e339d4900a2d4b54ee25ed959cf62bacb012fe61e6b99d7958c10a
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtserialbus,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtserialbus,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtserialbus,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26
|
||||
$(PKG)_CHECKSUM := 52317fded73ad0beb0a2ecf93124a8e2dfdcf14270a762c1f4fd06fb075506ad
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947
|
||||
$(PKG)_CHECKSUM := 9873191c211ab4da9c0bc47b1e3549f475db4d448bba3175e0f86b24eefadc89
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
|
||||
|
|
|
@ -22,6 +22,8 @@ target_link_libraries(
|
|||
png
|
||||
glib-2.0
|
||||
winmm
|
||||
dwmapi
|
||||
uxtheme
|
||||
ws2_32
|
||||
intl
|
||||
iconv
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac
|
||||
$(PKG)_CHECKSUM := 95ec8e76d393b6ba26ffff5041fce41946d2bf3aec1402c6533e24d9fc269d83
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7
|
||||
$(PKG)_CHECKSUM := 3b7cf72ec50bc2a02bf4e4427b184febac909dba0e02e1861321ca1629c3fc2e
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add
|
||||
$(PKG)_CHECKSUM := 35fdf5b39d930935b6299ac59f347bea89b983e16bd7961fee3f1b8e16f4e21c
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtvirtualkeyboard,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtvirtualkeyboard,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtvirtualkeyboard,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b
|
||||
$(PKG)_CHECKSUM := 5bf5b15413baa235ee2cbfd136ea3b9303b32879b54f9f25bfb4dc96d37d0b4a
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtwebchannel,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtwebchannel,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtwebchannel,$(qtbase_URL))
|
||||
|
|
|
@ -5,20 +5,18 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03
|
||||
$(PKG)_CHECKSUM := 79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst /submodules/,/,$(subst official_releases/qt,community_releases,$(subst qtbase,qtwebkit,$(qtbase_URL))))
|
||||
$(PKG)_DEPS := gcc qtbase qtmultimedia sqlite
|
||||
$(PKG)_URL := http://download.qt.io/community_releases/5.8/5.8.0-final/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc qtbase qtmultimedia qtquickcontrols sqlite
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
echo $(qtbase_VERSION)
|
||||
endef
|
||||
|
||||
define $(PKG)_BUILD_SHARED
|
||||
# looks for build tools with .exe suffix and tries to use win_flex
|
||||
$(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf'
|
||||
cd '$(1)' && mkdir -p .git && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)'
|
||||
$(MAKE) -C '$(1)' -j 1 install
|
||||
cd '$(BUILD_DIR)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(SOURCE_DIR)'
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
|
||||
endef
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1
|
||||
$(PKG)_CHECKSUM := aa110af297d0d3239f346c3ee0cd43621adf463eb62a04941bbfe3fcccb845f5
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtwebsockets,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtwebsockets,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := b3bcf9693e0205263f5d227f2204cf12c3a3d1e200b3114723511ee3bdf2159f
|
||||
$(PKG)_CHECKSUM := b7d8d4dc8c11f4e70668da509d827c7342b3e5864e8d83f3a0fa56b9cd527fd3
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtwebview,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtwebview,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtwebview,$(qtbase_URL))
|
||||
|
|
|
@ -1,25 +1,27 @@
|
|||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
From dc0cb681cde6899b40923570c29adcf1c20c54cb Mon Sep 17 00:00:00 2001
|
||||
From 9aad92fdf482f1a38360559586db9ee2df5d9fc4 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 6 Aug 2015 20:41:14 +0200
|
||||
Subject: [PATCH] fix undefined reference to `__imp_CreateRectRgn'
|
||||
Date: Sun, 29 Jan 2017 20:27:29 +0100
|
||||
Subject: [PATCH] build fix for MXE
|
||||
|
||||
Change-Id: I707d168173b210034e3dff9580388fb630d858f8
|
||||
Needed for the shared build. In the static build, gdi32 is probably brought in as a transitive dependency.
|
||||
|
||||
Change-Id: Ic0b1ab49cfb04559823c7446bda197b34ea15f54
|
||||
|
||||
diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro
|
||||
index 7f6bba4..835b2e7 100644
|
||||
index 5d93c6b..4c423b0 100644
|
||||
--- a/src/winextras/winextras.pro
|
||||
+++ b/src/winextras/winextras.pro
|
||||
@@ -47,7 +47,7 @@ QMAKE_DOCS = $$PWD/doc/qtwinextras.qdocconf
|
||||
@@ -45,7 +45,7 @@ HEADERS += \
|
||||
|
||||
DEFINES += NTDDI_VERSION=0x06010000 _WIN32_WINNT=0x0601
|
||||
LIBS_PRIVATE += -lole32 -lshlwapi -lshell32
|
||||
-win32:!qtHaveModule(opengl)|contains(QT_CONFIG, dynamicgl):LIBS_PRIVATE += -lgdi32
|
||||
+win32:shared|!qtHaveModule(opengl)|contains(QT_CONFIG, dynamicgl):LIBS_PRIVATE += -lgdi32
|
||||
QMAKE_DOCS = $$PWD/doc/qtwinextras.qdocconf
|
||||
|
||||
-LIBS_PRIVATE += -lole32 -lshlwapi -lshell32 -ldwmapi
|
||||
+LIBS_PRIVATE += -lole32 -lshlwapi -lshell32 -ldwmapi -lgdi32
|
||||
win32:!qtHaveModule(opengl)|qtConfig(dynamicgl):LIBS_PRIVATE += -lgdi32
|
||||
|
||||
OTHER_FILES += \
|
||||
doc/qtwinextras.qdocconf \
|
||||
--
|
||||
2.1.4
|
||||
2.9.3
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := 241463a49fef3543b47a2874bd373ddf5a88321de169730db09ae333018ef3cc
|
||||
$(PKG)_CHECKSUM := 27ff7b94bd465709d5f8409b3e02a3a393e908613357b1edbf18ebbcb0c2c19c
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL))
|
||||
|
|
|
@ -5,7 +5,7 @@ $(PKG)_WEBSITE := http://qt-project.org/
|
|||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5
|
||||
$(PKG)_CHECKSUM := 7bffa65ea52e54fb1314b45222888612d55eaf51a936a6119b8756266439da04
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))
|
||||
|
|
Loading…
Reference in New Issue