You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
qwt/qwt-qt54.patch

48 lines
1.2 KiB

Index: src/qwt_transform.cpp
===================================================================
--- src/qwt_transform.cpp (revision 2064)
+++ src/qwt_transform.cpp (revision 2066)
@@ -14,12 +14,24 @@
#define qExp(x) ::exp(x)
#endif
+#if QT_VERSION >= 0x050400
+
//! Smallest allowed value for logarithmic scales: 1.0e-150
+const double QwtLogTransform::LogMin = 1.0e-150;
+
+//! Largest allowed value for logarithmic scales: 1.0e150
+const double QwtLogTransform::LogMax = 1.0e150;
+
+#else
+
+//! Smallest allowed value for logarithmic scales: 1.0e-150
QT_STATIC_CONST_IMPL double QwtLogTransform::LogMin = 1.0e-150;
//! Largest allowed value for logarithmic scales: 1.0e150
QT_STATIC_CONST_IMPL double QwtLogTransform::LogMax = 1.0e150;
+#endif
+
//! Constructor
QwtTransform::QwtTransform()
{
Index: src/qwt_transform.h
===================================================================
--- src/qwt_transform.h (revision 2064)
+++ src/qwt_transform.h (revision 2066)
@@ -107,8 +107,13 @@
virtual QwtTransform *copy() const;
+#if QT_VERSION >= 0x050400
+ static const double LogMin;
+ static const double LogMax;
+#else
QT_STATIC_CONST double LogMin;
QT_STATIC_CONST double LogMax;
+#endif
};
/*!