Mercurial > mxe-octave
changeset 5099:9d35f8eb1e76
qt5: update to 5.13.0
* src/qttools.mk, src/qtbase.mk, src/qtsvg.mk
src/qtimageformats.mk: update checksum, version
* src/qtbase-1-fixes.patch, src/qtimageformats-1.patch,
src/qttools-1.patch: update patch
| author | John Donoghue |
|---|---|
| date | Fri, 21 Jun 2019 14:28:30 -0400 |
| parents | 80625be06cf4 |
| children | ea13fb8b8304 |
| files | src/qtbase-1-fixes.patch src/qtbase.mk src/qtimageformats-1.patch src/qtimageformats.mk src/qtsvg.mk src/qttools-1.patch src/qttools.mk |
| diffstat | 7 files changed, 176 insertions(+), 166 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qtbase-1-fixes.patch Thu Jun 20 11:32:41 2019 -0400 +++ b/src/qtbase-1-fixes.patch Fri Jun 21 14:28:30 2019 -0400 @@ -1,9 +1,9 @@ This file is part of MXE. See LICENSE.md for licensing information. -From 01ee0b5260f1b83a81769132c0705aab05481641 Mon Sep 17 00:00:00 2001 +From 86164c585b85559746c0eb80a7354a01d311bf64 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 1/5] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 1/4] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -12,10 +12,10 @@ See also: https://github.com/mxe/mxe/issues/1185 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 3ed6dd5889..cc5bc9dc16 100644 +index 705e0a3c93..1adac54d3b 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -214,12 +214,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -291,6 +291,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF @@ -23,6 +23,10 @@ + add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) +!!ELSE !!IF !isEmpty(CMAKE_STATIC_TYPE) + if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +@@ -328,9 +331,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") -!!ELSE @@ -32,13 +36,13 @@ add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF -- -2.19.1 +2.20.1 -From 48723a27c10322a9beff2f84422c757df2639edd Mon Sep 17 00:00:00 2001 +From 2bdf75033a353d809d6faf2af33cf0af1d1282ff Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Sat, 16 Jul 2016 20:31:07 +1000 -Subject: [PATCH 2/5] Fix pkgconfig file and library naming +Subject: [PATCH 2/4] Fix pkgconfig file and library naming See: https://codereview.qt-project.org/#/c/165394/ https://bugreports.qt.io/browse/QTBUG-30898 @@ -101,62 +105,21 @@ - -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end -- -2.19.1 +2.20.1 -From 6a7989a069a7aa88e898c4f68bd753b480af0cdf Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 29 Jan 2017 13:02:16 +0100 -Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific) - -Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f - -diff --git a/src/gui/configure.json b/src/gui/configure.json -index 89934c8f1d..456643a22c 100644 ---- a/src/gui/configure.json -+++ b/src/gui/configure.json -@@ -1209,7 +1209,7 @@ - "fontconfig": { - "label": "Fontconfig", - "autoDetect": "!config.darwin", -- "condition": "!config.win32 && features.system-freetype && libs.fontconfig", -+ "condition": "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 0c04608fca..a26e02fbf3 100644 ---- a/src/plugins/platforms/minimal/qminimalintegration.cpp -+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp -@@ -161,7 +161,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const - - if (!m_fontDatabase) { - #if QT_CONFIG(fontconfig) -- m_fontDatabase = new QGenericUnixFontDatabase; -+#ifdef Q_OS_WIN -+ m_fontDatabase = new QFreeTypeFontDatabase; -+#else -+ m_fontDatabase = new QGenericUnixFontDatabase; -+#endif - #else - m_fontDatabase = QPlatformIntegration::fontDatabase(); - #endif --- -2.19.1 - - -From dbe7086a860dc8aac17ed5d76bc45d605a19ac02 Mon Sep 17 00:00:00 2001 +From 04a80b8d9d5ec64efb61f440238113a82015e7df Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 11 Jun 2017 00:27:41 +0200 -Subject: [PATCH 4/5] use pkg-config for harfbuzz +Subject: [PATCH 3/4] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index 456643a22c..f36e15603b 100644 +index 6280b4dfa2..e094ee12e6 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -301,7 +301,8 @@ +@@ -303,7 +303,8 @@ }, "headers": "harfbuzz/hb.h", "sources": [ @@ -167,13 +130,13 @@ }, "imf": { -- -2.19.1 +2.20.1 -From 2f96f49ffa2e4b42bb35da9304bba971cfcc1475 Mon Sep 17 00:00:00 2001 +From ba796f23ed3145a856c6a05abee5d526c3b10d58 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 23 Nov 2017 11:28:47 +0200 -Subject: [PATCH 5/5] disable qt_random_cpu for i686-w64-mingw32 +Subject: [PATCH 4/4] disable qt_random_cpu for i686-w64-mingw32 Workaround for gcc internal error compiling for mingw32: global/qrandom.cpp: In function 'qsizetype qt_random_cpu(void*, qsizetype)': @@ -191,7 +154,7 @@ Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 6195c324e7..94902bcfc2 100644 +index 90df8653a7..0d7002f2e8 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando @@ -204,7 +167,7 @@ # ifdef Q_PROCESSOR_X86_64 -- -2.19.1 +2.20.1 diff -ur qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf --- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400 @@ -218,3 +181,18 @@ QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions +diff -ur qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp +--- qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:24:11.167038403 -0400 ++++ qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:31:33.734199370 -0400 +@@ -162,7 +162,11 @@ + + if (!m_fontDatabase) { + #if QT_CONFIG(fontconfig) ++# ifdef Q_OS_WIN ++ m_fontDatabase = new QFreeTypeFontDatabase; ++# else + m_fontDatabase = new QGenericUnixFontDatabase; ++# endif + #else + m_fontDatabase = QPlatformIntegration::fontDatabase(); + #endif
--- a/src/qtbase.mk Thu Jun 20 11:32:41 2019 -0400 +++ b/src/qtbase.mk Fri Jun 21 14:28:30 2019 -0400 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.12.3 -$(PKG)_CHECKSUM := dbe6ed4779998f757473a727b7ff3300c7d31155 +$(PKG)_VERSION := 5.13.0 +$(PKG)_CHECKSUM := 68506e1d6a710f657fe9ddf4e8fec55ad845e81b $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
--- a/src/qtimageformats-1.patch Thu Jun 20 11:32:41 2019 -0400 +++ b/src/qtimageformats-1.patch Fri Jun 21 14:28:30 2019 -0400 @@ -1,111 +1,120 @@ This file is part of MXE. See LICENSE.md for licensing information. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 1/3] [MXE] pkg-config support for libtiff-4 - +From b3504d8f2ce90aeaf3c84ffb6716ee14d173de17 Mon Sep 17 00:00:00 2001 +From: Joerg Bornemann <joerg.bornemann@qt.io> +Date: Tue, 7 May 2019 11:30:05 +0200 +Subject: [PATCH 1/2] Fix feature and library checks for tiff and mng -diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro -index 1111111..2222222 100644 ---- a/config.tests/libtiff/libtiff.pro -+++ b/config.tests/libtiff/libtiff.pro -@@ -2,5 +2,7 @@ SOURCES = libtiff.cpp - CONFIG -= qt dylib - mac:CONFIG -= app_bundle - win32:CONFIG += console --unix|mingw: LIBS += -ltiff -+CONFIG += link_pkgconfig -+packagesExist(libtiff-4):PKGCONFIG += libtiff-4 -+else:if(unix|win32-g++*): LIBS += -ltiff - else:win32: LIBS += libtiff.lib -diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro -index 1111111..2222222 100644 ---- a/src/plugins/imageformats/tiff/tiff.pro -+++ b/src/plugins/imageformats/tiff/tiff.pro -@@ -5,7 +5,9 @@ SOURCES += main.cpp qtiffhandler.cpp - OTHER_FILES += tiff.json - - config_libtiff { -- unix|mingw: LIBS += -ltiff -+ CONFIG += link_pkgconfig -+ packagesExist(libtiff-4):PKGCONFIG += libtiff-4 -+ else:if(unix|win32-g++*): LIBS += -ltiff - else:win32: LIBS += libtiff.lib - } else { - include($$PWD/../../../3rdparty/libtiff.pri) +This amends commit a33e3aea. -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Wed, 19 Dec 2012 23:29:52 +0100 -Subject: [PATCH 2/3] [MXE] pkg-config support for libmng - +Change-Id: I03304f5bf300e5e52476c3f3d6b06b0815009720 +Reviewed-by: Liang Qi <liang.qi@qt.io> +(cherry picked from commit 626c3053efd7905080ac4a65fca55551391a36e3) -diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro -index 1111111..2222222 100644 ---- a/config.tests/libmng/libmng.pro -+++ b/config.tests/libmng/libmng.pro -@@ -2,5 +2,7 @@ SOURCES = libmng.cpp - CONFIG -= qt dylib - mac:CONFIG -= app_bundle - win32:CONFIG += console --unix|mingw: LIBS += -lmng -+CONFIG += link_pkgconfig -+packagesExist(libmng):PKGCONFIG += libmng -+else:if(unix|win32-g++*): LIBS += -lmng - else:win32: LIBS += libmng.lib diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro -index 1111111..2222222 100644 +index 4641110..f509fa8 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro -@@ -5,7 +5,10 @@ SOURCES += main.cpp \ +@@ -5,8 +5,10 @@ SOURCES += main.cpp \ qmnghandler.cpp OTHER_FILES += mng.json -msvc: LIBS += libmng.lib -+CONFIG += link_pkgconfig -+packagesExist(libmng):PKGCONFIG += libmng -+else:if(unix|mingw): LIBS += -lmng -+else:msvc: LIBS += libmng.lib - else: LIBS += -lmng +-else: LIBS += -lmng ++include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) ++QT_FOR_CONFIG += imageformats-private ++ ++QMAKE_USE_PRIVATE += mng PLUGIN_TYPE = imageformats + PLUGIN_CLASS_NAME = QMngPlugin +diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro +index 04cfbdb..0c42749 100644 +--- a/src/plugins/imageformats/tiff/tiff.pro ++++ b/src/plugins/imageformats/tiff/tiff.pro +@@ -4,9 +4,11 @@ HEADERS += qtiffhandler_p.h + SOURCES += main.cpp qtiffhandler.cpp + OTHER_FILES += tiff.json + +-config_libtiff { +- unix|mingw: LIBS += -ltiff +- else:win32: LIBS += libtiff.lib ++include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) ++QT_FOR_CONFIG += imageformats-private ++ ++qtConfig(system-tiff) { ++ QMAKE_USE_PRIVATE += tiff + } else { + include($$PWD/../../../3rdparty/libtiff.pri) + } +-- +2.20.1 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From 9daaac5a219fb55628f0542e905d7157c2c68296 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> -Date: Fri, 16 Nov 2018 10:13:11 +0100 -Subject: [PATCH 3/3] [MXE] pkg-config support for libwebp +Date: Mon, 17 Jun 2019 13:54:23 +0200 +Subject: [PATCH 2/2] use pkgconfig -diff --git a/config.tests/libwebp/libwebp.pro b/config.tests/libwebp/libwebp.pro -index 1111111..2222222 100644 ---- a/config.tests/libwebp/libwebp.pro -+++ b/config.tests/libwebp/libwebp.pro -@@ -2,5 +2,9 @@ SOURCES = libwebp.cpp - CONFIG -= qt dylib - mac:CONFIG -= app_bundle - win32:CONFIG += console --unix|mingw: LIBS += -lwebp -lwebpdemux -+unix|mingw { -+ CONFIG += link_pkgconfig -+ packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux -+ else: LIBS += -lwebp -lwebpdemux -+} - else:win32: LIBS += libwebp.lib libwebpdemux.lib -diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro -index 1111111..2222222 100644 ---- a/src/plugins/imageformats/webp/webp.pro -+++ b/src/plugins/imageformats/webp/webp.pro -@@ -5,7 +5,11 @@ SOURCES += main.cpp qwebphandler.cpp - OTHER_FILES += webp.json - - config_libwebp { -- unix|win32-g++*: LIBS += -lwebp -lwebpdemux -+ unix|mingw { -+ CONFIG += link_pkgconfig -+ packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux -+ else: LIBS += -lwebp -lwebpdemux -+ } - else:win32: LIBS += libwebp.lib libwebpdemux.lib - } else { - include($$PWD/../../../3rdparty/libwebp.pri) +diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json +index 03d59d3..0cd3715 100644 +--- a/src/imageformats/configure.json ++++ b/src/imageformats/configure.json +@@ -51,9 +51,6 @@ + "stdio.h", + "libmng.h" + ], +- "qmake": [ +- "LIBS += -lmng" +- ], + "main": [ + "mng_handle hMNG;", + "mng_cleanup(&hMNG);", +@@ -67,6 +64,7 @@ + } + }, + "sources": [ ++ { "type": "pkgConfig", "args": "libmng" }, + "-lmng" + ] + }, +@@ -77,10 +75,6 @@ + "type": "compile", + "test": { + "include": "tiffio.h", +- "qmake": [ +- "unix|mingw: LIBS += -ltiff", +- "else:win32: LIBS += libtiff.lib" +- ], + "main": [ + "#if !defined(TIFF_VERSION) && defined(TIFF_VERSION_CLASSIC)", + "// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC and TIFF_VERSION_BIG", +@@ -105,6 +99,7 @@ + } + }, + "sources": [ ++ { "type": "pkgConfig", "args": "libtiff-4" }, + "-ltiff" + ] + }, +@@ -119,9 +114,6 @@ + "webp/encode.h", + "webp/demux.h" + ], +- "qmake": [ +- "LIBS += -lwebp -lwebpdemux" +- ], + "main": [ + "#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) || WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202)", + "#error \"Incompatible libwebp version\"", +@@ -144,6 +136,7 @@ + } + }, + "sources": [ ++ { "type": "pkgConfig", "args": "libwebp libwebpdemux" }, + "-lwebp -lwebpdemux" + ] + } +-- +2.20.1 +
--- a/src/qtimageformats.mk Thu Jun 20 11:32:41 2019 -0400 +++ b/src/qtimageformats.mk Fri Jun 21 14:28:30 2019 -0400 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 099145ff9462bb093fedeeddbdd365a3f6cdf540 +$(PKG)_CHECKSUM := eb8b95f6223c5d3e6f0bcdfc936c93abf9bdeb61 $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
--- a/src/qtsvg.mk Thu Jun 20 11:32:41 2019 -0400 +++ b/src/qtsvg.mk Fri Jun 21 14:28:30 2019 -0400 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := d7e46f990e21941bbde143a2d658858b23fe48a9 +$(PKG)_CHECKSUM := 65bdcfa07141fb44a35d32f8887a783d91ca059b $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools-1.patch Thu Jun 20 11:32:41 2019 -0400 +++ b/src/qttools-1.patch Fri Jun 21 14:28:30 2019 -0400 @@ -1,24 +1,47 @@ -# This file is part of MXE. See LICENSE.md for licensing information. +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. -From 3dc7b77a86b4d399836472484a5b3448a27f1a1e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> -Date: Wed, 21 May 2014 11:31:45 +0200 -Subject: [PATCH] disable windeployqt (MXE specific) +Date: Sun, 28 Apr 2019 23:07:09 +1000 +Subject: [PATCH 1/2] disable windeployqt (MXE specific) diff --git a/src/src.pro b/src/src.pro -index 722b32e..66ce5bf 100644 +index 1111111..2222222 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -27,7 +27,7 @@ android { +@@ -35,7 +35,7 @@ macos { qtHaveModule(dbus): SUBDIRS += qdbus -win32|winrt:SUBDIRS += windeployqt +#win32|winrt:SUBDIRS += windeployqt winrt:SUBDIRS += winrtrunner - qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag + qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag --- -2.1.2 + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Sun, 28 Apr 2019 23:12:41 +1000 +Subject: [PATCH 2/2] disable qdoc (MXE specific - requires libclang-devel) + +diff --git a/src/src.pro b/src/src.pro +index 1111111..2222222 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -23,9 +23,9 @@ qtConfig(library) { + !android|android_app: SUBDIRS += qtplugininfo + } + +-include($$OUT_PWD/qdoc/qtqdoc-config.pri) +-QT_FOR_CONFIG += qdoc-private +-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc ++#include($$OUT_PWD/qdoc/qtqdoc-config.pri) ++#QT_FOR_CONFIG += qdoc-private ++#qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc + + !android|android_app: SUBDIRS += qtpaths +
--- a/src/qttools.mk Thu Jun 20 11:32:41 2019 -0400 +++ b/src/qttools.mk Fri Jun 21 14:28:30 2019 -0400 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := f63a707d1de3fea68a4796762728ae12e5c97b93 +$(PKG)_CHECKSUM := 9d6828bd991507e2390c6e2f23d69eac715fcca0 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))