sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix building with QT 5.5

Browse Source
This commit is contained in:
Stephen Knox 2018-09-17 22:29:44 +01:00 committed by Nyall Dawson
parent 0296c272de
commit d99d506e75
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/qgsvectorlayerproperties.cpp
View File

@ -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() ) );

2
src/app/qgsvectorlayerproperties.h
View File

@ -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;