From d99d506e75e47173c63a34f62486565d7bbbcc98 Mon Sep 17 00:00:00 2001 From: Stephen Knox Date: Mon, 17 Sep 2018 22:29:44 +0100 Subject: [PATCH] Fix building with QT 5.5 --- src/app/qgsvectorlayerproperties.cpp | 6 ++++-- src/app/qgsvectorlayerproperties.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 42f4c14fa32..7e58fb40929 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -117,8 +117,10 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( mBtnStyle = new QPushButton( tr( "Style" ), this ); QMenu *menuStyle = new QMenu( this ); - mActionLoadStyle = menuStyle->addAction( tr( "Load Style…" ), this, &QgsVectorLayerProperties::loadStyle ); - menuStyle->addAction( tr( "Save Style…" ), this, &QgsVectorLayerProperties::saveStyleAs ); + mActionLoadStyle = menuStyle->addAction( tr( "Load Style…" ) ); + connect( mActionLoadStyle, &QAction::triggered, this, &QgsVectorLayerProperties::loadStyle ); + mActionSaveStyle = menuStyle->addAction( tr( "Save Style…" ) ); + connect( mActionSaveStyle, &QAction::triggered, this, &QgsVectorLayerProperties::saveStyleAs ); menuStyle->addSeparator(); menuStyle->addAction( tr( "Save as Default" ), this, SLOT( saveDefaultStyle_clicked() ) ); menuStyle->addAction( tr( "Restore Default" ), this, SLOT( loadDefaultStyle_clicked() ) ); diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h index dcd999e540e..67013521962 100644 --- a/src/app/qgsvectorlayerproperties.h +++ b/src/app/qgsvectorlayerproperties.h @@ -195,7 +195,7 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private QMenu *mLoadStyleMenu = nullptr; QAction *mActionLoadStyle = nullptr; - QAction *mActionSaveStyleAs = nullptr; + QAction *mActionSaveStyle = nullptr; //! Renderer dialog which is shown QgsRendererPropertiesDialog *mRendererDialog = nullptr;