diff options
author | Tony Theodore <tonyt@logyst.com> | 2014-12-09 09:21:06 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2014-12-09 09:21:06 (GMT) |
commit | 119393a16d5cf96a4e0f54cf88b26eff1ac7354a (patch) | |
tree | 79204ccac84bd32221ac331c6b883fd16e7994ae /src | |
parent | 5c953de2bf677f73ad91671f0043606812a50d55 (diff) | |
download | mxe-119393a16d5cf96a4e0f54cf88b26eff1ac7354a.zip mxe-119393a16d5cf96a4e0f54cf88b26eff1ac7354a.tar.gz mxe-119393a16d5cf96a4e0f54cf88b26eff1ac7354a.tar.bz2 |
qwt: fix for removed QT_STATIC_CONST* macros
Diffstat (limited to 'src')
-rw-r--r-- | src/qwt-1-fixes-crlf.patch | 71 | ||||
-rw-r--r-- | src/qwt-1-fixes.patch | 14 |
2 files changed, 71 insertions, 14 deletions
diff --git a/src/qwt-1-fixes-crlf.patch b/src/qwt-1-fixes-crlf.patch new file mode 100644 index 0000000..d5c3c96 --- /dev/null +++ b/src/qwt-1-fixes-crlf.patch @@ -0,0 +1,71 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 254b0588efb05c757b29b392bb8d147f35c836a7 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Tue, 9 Dec 2014 20:10:47 +1100 +Subject: [PATCH 1/2] fix install prefix + + +diff --git a/qwtconfig.pri b/qwtconfig.pri +index 6c7ed0a..fcc91da 100644 +--- a/qwtconfig.pri ++++ b/qwtconfig.pri +@@ -23,7 +23,7 @@ unix { + }
+
+ win32 {
+- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
++# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
+ }
+
+ QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
+-- +1.9.3 (Apple Git-50) + + +From c2481957edc8346d17d9157137bfb61c7db5fdaa Mon Sep 17 00:00:00 2001 +From: MXE +Date: Tue, 9 Dec 2014 20:15:24 +1100 +Subject: [PATCH 2/2] fix for deprecated QT_STATIC_CONST* macros + +taken from: +http://sourceforge.net/p/qwt/code/2063/ + +diff --git a/src/qwt_transform.cpp b/src/qwt_transform.cpp +index d42b046..5e7fa1d 100644 +--- a/src/qwt_transform.cpp ++++ b/src/qwt_transform.cpp +@@ -15,10 +15,10 @@ + #endif
+
+ //! Smallest allowed value for logarithmic scales: 1.0e-150
+-QT_STATIC_CONST_IMPL double QwtLogTransform::LogMin = 1.0e-150;
++const double QwtLogTransform::LogMin = 1.0e-150;
+
+ //! Largest allowed value for logarithmic scales: 1.0e150
+-QT_STATIC_CONST_IMPL double QwtLogTransform::LogMax = 1.0e150;
++const double QwtLogTransform::LogMax = 1.0e150;
+
+ //! Constructor
+ QwtTransform::QwtTransform()
+diff --git a/src/qwt_transform.h b/src/qwt_transform.h +index 13eeef2..ae28ac4 100644 +--- a/src/qwt_transform.h ++++ b/src/qwt_transform.h +@@ -107,8 +107,8 @@ public: +
+ virtual QwtTransform *copy() const;
+
+- QT_STATIC_CONST double LogMin;
+- QT_STATIC_CONST double LogMax;
++ static const double LogMin;
++ static const double LogMax;
+ };
+
+ /*!
+-- +1.9.3 (Apple Git-50) + diff --git a/src/qwt-1-fixes.patch b/src/qwt-1-fixes.patch deleted file mode 100644 index 18b83a4..0000000 --- a/src/qwt-1-fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 @@ - }
-
- win32 {
-- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
-+# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
- }
-
- QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
|