Skip to content

Commit

Permalink
Fix building with QT 5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
stev-0 authored and nyalldawson committed Sep 17, 2018
1 parent 0296c27 commit d99d506
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/app/qgsvectorlayerproperties.cpp
Expand Up @@ -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() ) );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsvectorlayerproperties.h
Expand Up @@ -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;
Expand Down

0 comments on commit d99d506

Please sign in to comment.