sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7330 from rouault/fix_build_with_qt_5_5

Browse Source 
Fix build with QT 5.5
This commit is contained in:
Even Rouault 2018-06-29 00:00:40 +02:00 committed by GitHub
commit 0c0981aa6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/mesh/qgsmeshrenderermeshsettingswidget.cpp
View File

@ -34,7 +34,7 @@ QgsMeshRendererMeshSettingsWidget::QgsMeshRendererMeshSettingsWidget( QWidget *p
setupUi( this ); setupUi( this );
connect( mColorWidget, &QgsColorButton::colorChanged, this, &QgsMeshRendererMeshSettingsWidget::widgetChanged ); 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 ); this, &QgsMeshRendererMeshSettingsWidget::widgetChanged );
} }

7
src/app/mesh/qgsmeshrenderervectorsettingswidget.cpp
View File

@ -27,15 +27,14 @@ QgsMeshRendererVectorSettingsWidget::QgsMeshRendererVectorSettingsWidget( QWidge
setupUi( this ); setupUi( this );
connect( mColorWidget, &QgsColorButton::colorChanged, this, &QgsMeshRendererVectorSettingsWidget::widgetChanged ); 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 ); this, &QgsMeshRendererVectorSettingsWidget::widgetChanged );
connect( mShaftLengthComboBox, QOverload<int>::of( &QComboBox::currentIndexChanged ), connect( mShaftLengthComboBox, qgis::overload<int>::of( &QComboBox::currentIndexChanged ),
this, &QgsMeshRendererVectorSettingsWidget::widgetChanged ); this, &QgsMeshRendererVectorSettingsWidget::widgetChanged );
connect( mShaftLengthComboBox, QOverload<int>::of( &QComboBox::currentIndexChanged ), connect( mShaftLengthComboBox, qgis::overload<int>::of( &QComboBox::currentIndexChanged ),
mShaftOptionsStackedWidget, &QStackedWidget::setCurrentIndex ); mShaftOptionsStackedWidget, &QStackedWidget::setCurrentIndex );
QVector<QLineEdit *> widgets; QVector<QLineEdit *> widgets;
widgets << mMinMagLineEdit << mMaxMagLineEdit widgets << mMinMagLineEdit << mMaxMagLineEdit
<< mHeadWidthLineEdit << mHeadLengthLineEdit << mHeadWidthLineEdit << mHeadLengthLineEdit

3
tests/code_layout/test_banned_keywords.sh
View File

@ -104,6 +104,9 @@ HINTS[26]="Use std::unique_ptr instead"
KEYWORDS[27]="QSharedPointer" KEYWORDS[27]="QSharedPointer"
HINTS[27]="Use std::shared_ptr instead" HINTS[27]="Use std::shared_ptr instead"
KEYWORDS[28]="QOverload"
HINTS[28]="Use qgis::overload instead"
RES= RES=
DIR=$(git rev-parse --show-toplevel) DIR=$(git rev-parse --show-toplevel)