sigrok-cross-android: Adapt PulseView for Qt5

[sigrok-util.git] / cross-compile / android / pulseview-cpp.patch

diff --git a/cross-compile/android/pulseview-cpp.patch b/cross-compile/android/pulseview-cpp.patch
index 14057048f9db9d3aceb37dc7b7ebf7f4c662fe0f..5acdf36c5d1672d0fe01f09e7345780681d4a8f0 100644 (file)
--- a/cross-compile/android/pulseview-cpp.patch
+++ b/cross-compile/android/pulseview-cpp.patch
@@ -24,19 +24,6 @@ index 11767a6..b8eed96 100644
  
  target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
  
-diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
-index e4f0276..861d25b 100644
---- a/pv/view/decodetrace.cpp
-+++ b/pv/view/decodetrace.cpp
-@@ -373,7 +373,7 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &
- {
-       const QString text = a.annotations().empty() ?
-               QString() : a.annotations().back();
--      const double w = min(p.boundingRect(QRectF(), 0, text).width(),
-+      const double w = min((double)p.boundingRect(QRectF(), 0, text).width(),
-               0.0) + h;
-       const QRectF rect(x - w / 2, y - h / 2, w, h);
- 
 diff --git a/main.cpp b/main.cpp
 index 2c6a59e..79627db 100644
 --- a/main.cpp 2014-04-26 23:40:24.253187700 +0200