From b6b394c1fddc7a4d5882eb78d8abbd441c1f0168 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 2 Feb 2018 21:34:07 +0100 Subject: [PATCH] INSTALL: use meta package to install osgeo4w build dependencies --- INSTALL | 4 ++-- doc/INSTALL.html | 4 ++-- doc/msvc.t2t | 15 ++------------- src/gui/qgshistogramwidget.cpp | 2 +- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/INSTALL b/INSTALL index 249db472967..cc79495513b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,9 +1,9 @@ QGIS Building QGIS from source - step by step -Wednesday April 12, 2017 +Sunday January 14, 2018 -Last Updated: Wednesday April 12, 2017 +Last Updated: Sunday January 14, 2018 Last Change : Wednesday April 12, 2017 diff --git a/doc/INSTALL.html b/doc/INSTALL.html index cd9c7ae6214..0d59f66b08e 100644 --- a/doc/INSTALL.html +++ b/doc/INSTALL.html @@ -77,12 +77,12 @@ label{ background-color: #FFFFCC;

-Last Updated: Wednesday April 12, 2017 +Last Updated: Sunday January 14, 2018 Last Change : Wednesday April 12, 2017

diff --git a/doc/msvc.t2t b/doc/msvc.t2t index 66f61ae4086..9703a20cddc 100644 --- a/doc/msvc.t2t +++ b/doc/msvc.t2t @@ -40,19 +40,8 @@ For the QGIS build you need to install following packages from cygwin: and from OSGeo4W (select //Advanced Installation//): -- expat -- fcgi -- gdal -- grass -- gsl-devel -- iconv -- pyqt4 -- qt4-devel -- qwt5-devel-qt4 -- sip -- spatialite -- libspatialindex-devel -- python-qscintilla +- qgis-rel-deps +- This will also select packages the above packages depend on. diff --git a/src/gui/qgshistogramwidget.cpp b/src/gui/qgshistogramwidget.cpp index 34361352b0b..69a7c4f4814 100644 --- a/src/gui/qgshistogramwidget.cpp +++ b/src/gui/qgshistogramwidget.cpp @@ -92,7 +92,7 @@ QgsHistogramWidget::~QgsHistogramWidget() static bool _rangesByLower( const QgsRendererRangeV2& a, const QgsRendererRangeV2& b ) { - return a.lowerValue() < b.lowerValue() ? -1 : 0; + return a.lowerValue() < b.lowerValue(); } void QgsHistogramWidget::setGraduatedRanges( const QgsRangeList &ranges )