Skip to content

Commit

Permalink
Fix build with QT 5.5
Browse files Browse the repository at this point in the history
QOverload is new in QT 5.7
  • Loading branch information
rouault committed Jun 28, 2018
1 parent c76a1b5 commit f5d2c7b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/app/mesh/qgsmeshrenderermeshsettingswidget.cpp
Expand Up @@ -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 );
}

Expand Down
7 changes: 3 additions & 4 deletions src/app/mesh/qgsmeshrenderervectorsettingswidget.cpp
Expand Up @@ -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
Expand Down

0 comments on commit f5d2c7b

Please sign in to comment.