1. 07 May, 2014 7 commits
  2. 06 May, 2014 9 commits
  3. 05 May, 2014 4 commits
  4. 02 May, 2014 2 commits
  5. 01 May, 2014 3 commits
  6. 30 Apr, 2014 3 commits
  7. 29 Apr, 2014 4 commits
  8. 28 Apr, 2014 2 commits
    • Lorenz Meier's avatar
      Merge pull request #626 from koenkooi/qminmax-fix · cbb366b6
      Lorenz Meier authored
      fix qmin/qmax types
      cbb366b6
    • Koen Kooi's avatar
      fix qmin/qmax types · 0c66e26a
      Koen Kooi authored
      qreal is a double on some platforms (x86) and a float on others (e.g. ARM), cast it to fix build errors like these:
      
      src/ui/designer/QGCXYPlot.cc: In member function 'int
      XYPlotCurve::appendData(const QPointF&)':
      src/ui/designer/QGCXYPlot.cc:41:39: error: no matching function for call
      to 'qMin(double&, qreal)'
                   xmin = qMin(xmin, data.x());
                                             ^
      src/ui/designer/QGCXYPlot.cc:41:39: note: candidate is:
      In file included from
      /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtCore/qnamespace.h:45:0,
                       from
      /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtCore/qobjectdefs.h:45,
                       from
      /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/qwindowdefs.h:45,
                       from
      /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/qwidget.h:46,
                       from
      /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/qdockwidget.h:45,
                       from
      /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/QDockWidget:1,
                       from src/ui/designer/QGCXYPlot.cc:1:
      /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtCore/qglobal.h:1213:34:
      note: template<class T> const T& qMin(const T&, const T&)
       Q_DECL_CONSTEXPR inline const T &qMin(const T &a, const T &b) { return
      (a < b) ? a : b; }
                                        ^
      
      See http://www.qtcentre.org/archive/index.php/t-45475.html for some
      background.
      
      This fixes #625
      Signed-off-by: 's avatarKoen Kooi <koen@dominion.thruhere.net>
      0c66e26a
  9. 27 Apr, 2014 6 commits