~ubuntu-branches/ubuntu/oneiric/kdeplasma-addons/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/qwt6_build.patch

  • Committer: Package Import Robot
  • Author(s): Jonathan Kolberg
  • Date: 2011-09-09 00:22:29 UTC
  • mfrom: (0.7.10 upstream)
  • Revision ID: package-import@ubuntu.com-20110909002229-civiqsv4nttmou5r
Tags: 4:4.7.1-0ubuntu1
* New upstream release
* droped qwt6_build.patch
* droped kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Backport from KDE trunk b3527f12ad9f577535d07e9614cfda9ef8131910
2
 
Index: kdeplasma-addons-4.7.0/applets/kdeobservatory/src/commithistoryview.cpp
3
 
===================================================================
4
 
--- kdeplasma-addons-4.7.0.orig/applets/kdeobservatory/src/commithistoryview.cpp        2011-08-25 12:21:01.379133375 -0400
5
 
+++ kdeplasma-addons-4.7.0/applets/kdeobservatory/src/commithistoryview.cpp     2011-08-25 12:22:39.299133403 -0400
6
 
@@ -124,7 +124,11 @@
7
 
         plot->setCanvasBackground(QColor(0, 0, 140));
8
 
 
9
 
         QwtPlotCurve *curve = new QwtPlotCurve;
10
 
+#if QWT_VERSION >= (((6) << 16) | ((0) << 8) | (0))
11
 
+        curve->setSamples(x, y, j);    
12
 
+#else
13
 
         curve->setData(x, y, j);
14
 
+#endif
15
 
         delete []x;
16
 
         delete []y;
17