Mercurial > mxe-octave
comparison src/qttools-1.patch @ 4222:44b1a9b2193e
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 |
comparison
equal
deleted
inserted
replaced
| 4221:1cac12604314 | 4222:44b1a9b2193e |
|---|---|
| 1 # This file is part of MXE. | |
| 2 # See index.html for further information. | |
| 3 | |
| 4 From 3dc7b77a86b4d399836472484a5b3448a27f1a1e Mon Sep 17 00:00:00 2001 | |
| 5 From: Mark Brand <mabrand@mabrand.nl> | |
| 6 Date: Wed, 21 May 2014 11:31:45 +0200 | |
| 7 Subject: [PATCH] disable windeployqt (MXE specific) | |
| 8 | |
| 9 | |
| 10 diff --git a/src/src.pro b/src/src.pro | |
| 11 index 722b32e..66ce5bf 100644 | |
| 12 --- a/src/src.pro | |
| 13 +++ b/src/src.pro | |
| 14 @@ -27,7 +27,7 @@ android { | |
| 15 | |
| 16 qtHaveModule(dbus): SUBDIRS += qdbus | |
| 17 | |
| 18 -win32|winrt:SUBDIRS += windeployqt | |
| 19 +#win32|winrt:SUBDIRS += windeployqt | |
| 20 winrt:SUBDIRS += winrtrunner | |
| 21 qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag | |
| 22 | |
| 23 -- | |
| 24 2.1.2 | |
| 25 | |
| 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 | |
| 27 --- qttools-opensource-src-5.7.0.orig/src/linguist/lrelease/lrelease.pro 2016-08-25 16:36:01.797626791 -0400 | |
| 28 +++ qttools-opensource-src-5.7.0/src/linguist/lrelease/lrelease.pro 2016-08-25 17:46:21.465008465 -0400 | |
| 29 @@ -4,6 +4,8 @@ | |
| 30 | |
| 31 SOURCES += main.cpp | |
| 32 | |
| 33 +INCLUDEPATH += XXX | |
| 34 + | |
| 35 include(../shared/formats.pri) | |
| 36 include(../shared/proparser.pri) | |
| 37 |