annotate src/qttools-1.patch @ 5893:53a6c7df43f8

Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents 9d35f8eb1e76
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
1 This file is part of MXE. See LICENSE.md for licensing information.
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
2
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
3 Contains ad hoc patches for cross building.
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
4
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
6 From: Mark Brand <mabrand@mabrand.nl>
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
7 Date: Sun, 28 Apr 2019 23:07:09 +1000
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
8 Subject: [PATCH 1/2] disable windeployqt (MXE specific)
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
9
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
10
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
11 diff --git a/src/src.pro b/src/src.pro
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
12 index 1111111..2222222 100644
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
13 --- a/src/src.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
14 +++ b/src/src.pro
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
15 @@ -35,7 +35,7 @@ macos {
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
16
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
17 qtHaveModule(dbus): SUBDIRS += qdbus
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
18
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
19 -win32|winrt:SUBDIRS += windeployqt
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
20 +#win32|winrt:SUBDIRS += windeployqt
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
21 winrt:SUBDIRS += winrtrunner
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
22 qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
23
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
24
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
25 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
26 From: Tony Theodore <tonyt@logyst.com>
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
27 Date: Sun, 28 Apr 2019 23:12:41 +1000
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
28 Subject: [PATCH 2/2] disable qdoc (MXE specific - requires libclang-devel)
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
29
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
30
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
31 diff --git a/src/src.pro b/src/src.pro
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
32 index 1111111..2222222 100644
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
33 --- a/src/src.pro
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
34 +++ b/src/src.pro
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
35 @@ -23,9 +23,9 @@ qtConfig(library) {
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
36 !android|android_app: SUBDIRS += qtplugininfo
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
37 }
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
38
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
39 -include($$OUT_PWD/qdoc/qtqdoc-config.pri)
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
40 -QT_FOR_CONFIG += qdoc-private
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
41 -qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
42 +#include($$OUT_PWD/qdoc/qtqdoc-config.pri)
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
43 +#QT_FOR_CONFIG += qdoc-private
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
44 +#qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
45
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
46 !android|android_app: SUBDIRS += qtpaths
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4956
diff changeset
47