summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2016-06-29 22:09:49 (GMT)
committerMark Brand <mabrand@mabrand.nl>2016-06-29 22:13:48 (GMT)
commit84c07b6c1754ab8f74790e281da991d1bbac7eef (patch)
treee07f5b1480b4d85c5b8c494f8f5d8e09902ec79b /src
parent141a4ad30a50122f1d7e67a4402e430dfc2f8d04 (diff)
downloadmxe-84c07b6c1754ab8f74790e281da991d1bbac7eef.zip
mxe-84c07b6c1754ab8f74790e281da991d1bbac7eef.tar.gz
mxe-84c07b6c1754ab8f74790e281da991d1bbac7eef.tar.bz2
fix patch for qwt_qt4
Should have been donen when qwt was updated in commit a4077c1bd7dbeba310106f10abdd91999cfafd32.
Diffstat (limited to 'src')
-rw-r--r--src/qwt_qt4-1-fixes-crlf.patch21
1 files changed, 16 insertions, 5 deletions
diff --git a/src/qwt_qt4-1-fixes-crlf.patch b/src/qwt_qt4-1-fixes-crlf.patch
index 18b83a4..1caf7dd 100644
--- a/src/qwt_qt4-1-fixes-crlf.patch
+++ b/src/qwt_qt4-1-fixes-crlf.patch
@@ -1,14 +1,25 @@
This file is part of MXE.
See index.html for further information.
---- qwt-6.0.1/qwtconfig.pri 2011-08-01 16:34:05.000000000 +0200
-+++ qwt-6.0.1/qwtconfig.pri 2011-12-03 10:14:53.371757822 +0100
-@@ -23,7 +23,7 @@
+From 888c3a631c821e3d27efbcd3da6247c3a5add135 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Tue, 9 Dec 2014 20:10:47 +1100
+Subject: [PATCH] fix install prefix
+
+
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index 1fe6055..3a69039 100644
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -24,7 +24,7 @@ unix {
}
win32 {
- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
-+# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
++ # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
+ # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
}
- QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
+--
+2.7.4
+