Mercurial > mxe-octave

annotate src/qttools-1.patch @ 4222:44b1a9b2193e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents
children 4cea16af20b4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
1 # This file is part of MXE.
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
2 # See index.html for further information.
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
3
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
4 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
5 From: Mark Brand <mabrand@mabrand.nl>
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
6 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
7 Subject: [PATCH] disable windeployqt (MXE specific)
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
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
10 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
11 index 722b32e..66ce5bf 100644
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
12 --- a/src/src.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
13 +++ b/src/src.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
14 @@ -27,7 +27,7 @@ android {
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
15
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
16 qtHaveModule(dbus): SUBDIRS += qdbus
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
17
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 +#win32|winrt:SUBDIRS += windeployqt
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
20 winrt:SUBDIRS += winrtrunner
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
21 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
22
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
23 --
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
24 2.1.2
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
25
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
26 diff -ur qttools-opensource-src-5.7.0.orig/src/linguist/lrelease/lrelease.pro qttools-opensource-src-5.7.0/src/linguist/lrelease/lrelease.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
27 --- qttools-opensource-src-5.7.0.orig/src/linguist/lrelease/lrelease.pro 2016-08-25 16:36:01.797626791 -0400
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
28 +++ qttools-opensource-src-5.7.0/src/linguist/lrelease/lrelease.pro 2016-08-25 17:46:21.465008465 -0400
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
29 @@ -4,6 +4,8 @@
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
30
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
31 SOURCES += main.cpp
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
32
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
33 +INCLUDEPATH += XXX
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
34 +
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
35 include(../shared/formats.pri)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
36 include(../shared/proparser.pri)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
37