Skip to content
Permalink
Browse files

Merge pull request #7330 from rouault/fix_build_with_qt_5_5

Fix build with QT 5.5
  • Loading branch information
rouault committed Jun 28, 2018
2 parents 11faa58 + b5b720d commit 0c0981aa6af83f77b98dc7f1d0dcc5bb23ac66dc
@@ -34,7 +34,7 @@ QgsMeshRendererMeshSettingsWidget::QgsMeshRendererMeshSettingsWidget( QWidget *p
setupUi( this );

connect( mColorWidget, &QgsColorButton::colorChanged, this, &QgsMeshRendererMeshSettingsWidget::widgetChanged );
connect( mLineWidthSpinBox, QOverload<double>::of( &QgsDoubleSpinBox::valueChanged ),
connect( mLineWidthSpinBox, qgis::overload<double>::of( &QgsDoubleSpinBox::valueChanged ),
this, &QgsMeshRendererMeshSettingsWidget::widgetChanged );
}

@@ -27,15 +27,14 @@ QgsMeshRendererVectorSettingsWidget::QgsMeshRendererVectorSettingsWidget( QWidge
setupUi( this );

connect( mColorWidget, &QgsColorButton::colorChanged, this, &QgsMeshRendererVectorSettingsWidget::widgetChanged );
connect( mLineWidthSpinBox, QOverload<double>::of( &QgsDoubleSpinBox::valueChanged ),
connect( mLineWidthSpinBox, qgis::overload<double>::of( &QgsDoubleSpinBox::valueChanged ),
this, &QgsMeshRendererVectorSettingsWidget::widgetChanged );

connect( mShaftLengthComboBox, QOverload<int>::of( &QComboBox::currentIndexChanged ),
connect( mShaftLengthComboBox, qgis::overload<int>::of( &QComboBox::currentIndexChanged ),
this, &QgsMeshRendererVectorSettingsWidget::widgetChanged );

connect( mShaftLengthComboBox, QOverload<int>::of( &QComboBox::currentIndexChanged ),
connect( mShaftLengthComboBox, qgis::overload<int>::of( &QComboBox::currentIndexChanged ),
mShaftOptionsStackedWidget, &QStackedWidget::setCurrentIndex );

QVector<QLineEdit *> widgets;
widgets << mMinMagLineEdit << mMaxMagLineEdit
<< mHeadWidthLineEdit << mHeadLengthLineEdit
@@ -104,6 +104,9 @@ HINTS[26]="Use std::unique_ptr instead"
KEYWORDS[27]="QSharedPointer"
HINTS[27]="Use std::shared_ptr instead"

KEYWORDS[28]="QOverload"
HINTS[28]="Use qgis::overload instead"

RES=
DIR=$(git rev-parse --show-toplevel)

0 comments on commit 0c0981a

Please sign in to comment.
You can’t perform that action at this time.