Skip to content

Commit

Permalink
Fix build error when using Qwt 6.1, followup to f283040
Browse files Browse the repository at this point in the history
  • Loading branch information
dakcarto committed May 20, 2014
1 parent 7d535b4 commit 530a36d
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/app/qgsidentifyresultsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,6 @@ void QgsIdentifyResultsDialog::mapLayerActionDestroyed()
}
}

#if defined(QWT_VERSION) && QWT_VERSION<0x060000
QgsIdentifyPlotCurve::QgsIdentifyPlotCurve( const QMap<QString, QString> &attributes,
QwtPlot* plot, const QString &title, QColor color )
{
Expand Down Expand Up @@ -651,7 +650,6 @@ QgsIdentifyPlotCurve::~QgsIdentifyPlotCurve()
delete mPlotCurve;
}
}
#endif

void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
QString label,
Expand Down

4 comments on commit 530a36d

@dakcarto
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etiennesky Please review this change, with regards to f283040 and fe2435c. I could not compile when using Qwt 6.1 otherwise.

@etiennesky
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

build fine with qwt5, this error probably appeared with the rebase.
can you make a quick test to make sure that the graph works fine for you? Just opening the test dataset landsat.tif should be enough.
thanks!

@dakcarto
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Appears fine when testing landsat.tif:
ident_graph

@etiennesky
Copy link
Contributor

@etiennesky etiennesky commented on 530a36d May 20, 2014 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.