Mercurial > mxe-octave

diff 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
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/qttools-1.patch	Thu Sep 29 11:22:51 2016 -0400
@@ -0,0 +1,37 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+From 3dc7b77a86b4d399836472484a5b3448a27f1a1e 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)
+
+
+diff --git a/src/src.pro b/src/src.pro
+index 722b32e..66ce5bf 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -27,7 +27,7 @@ android {
+ 
+ qtHaveModule(dbus): SUBDIRS += qdbus
+ 
+-win32|winrt:SUBDIRS += windeployqt
++#win32|winrt:SUBDIRS += windeployqt
+ winrt:SUBDIRS += winrtrunner
+ qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
+ 
+-- 
+2.1.2
+
+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
+--- qttools-opensource-src-5.7.0.orig/src/linguist/lrelease/lrelease.pro	2016-08-25 16:36:01.797626791 -0400
++++ qttools-opensource-src-5.7.0/src/linguist/lrelease/lrelease.pro	2016-08-25 17:46:21.465008465 -0400
+@@ -4,6 +4,8 @@
+ 
+ SOURCES += main.cpp
+ 
++INCLUDEPATH += XXX
++
+ include(../shared/formats.pri)
+ include(../shared/proparser.pri)
+