Mercurial > mxe-octave

annotate src/qttools-1.patch @ 4735:4cea16af20b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: update to v5.11.0, add support pcre2 * src/qtbase.mk: update version, checksum * src/qtimageformats.mk: update checksum * src/qtisvg.mk: update checksum * src/qttools.mk: update checksum * src/qtbase-1-fixes.patch, src/qttools-1.patch: update patch from mxe.cc * src/pcre2.mk: new file * index.html: add pcre2 * src/sqlite.mk: enable column metadata
author John Donoghue
date Fri, 22 Jun 2018 08:28:05 -0400
parents 44b1a9b2193e
children 030e6ff3eac5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4735
4cea16af20b4 qt5: update to v5.11.0, add support pcre2
John Donoghue
parents: 4222
diff changeset
1 # This file is part of MXE. See LICENSE.md for licensing information.
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
2
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
3 From 3dc7b77a86b4d399836472484a5b3448a27f1a1e Mon Sep 17 00:00:00 2001
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
4 From: Mark Brand <mabrand@mabrand.nl>
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
5 Date: Wed, 21 May 2014 11:31:45 +0200
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
6 Subject: [PATCH] disable windeployqt (MXE specific)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
7
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
8
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
9 diff --git a/src/src.pro b/src/src.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
10 index 722b32e..66ce5bf 100644
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
11 --- a/src/src.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
12 +++ b/src/src.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
13 @@ -27,7 +27,7 @@ android {
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
14
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
15 qtHaveModule(dbus): SUBDIRS += qdbus
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 -win32|winrt:SUBDIRS += windeployqt
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
18 +#win32|winrt:SUBDIRS += windeployqt
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
19 winrt:SUBDIRS += winrtrunner
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
20 qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
21
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
22 --
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
23 2.1.2
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
24