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

Merge pull request #4292 from Gustry/fix_mac_build

Browse Source 
fix undeclared identifier on MAC in composer
This commit is contained in:
Larry Shaffer 2017-03-22 12:12:10 -06:00 committed by GitHub
commit 265da3ffa0
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/composer/qgscomposer.cpp
View File

@ -3336,17 +3336,6 @@ void QgsComposer::resizeEvent( QResizeEvent *e )
saveWindowState();
}
#ifdef Q_OS_MAC
void QgsComposer::showEvent( QShowEvent *event )
{
// add to menu if (re)opening window (event not due to unminimize)
if ( !event->spontaneous() )
{
mQgis->addWindow( mWindowAction );
}
}
#endif
void QgsComposer::saveWindowState()
{
QgsSettings settings;

4
src/app/composer/qgscomposer.h
View File

@ -142,10 +142,6 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
//! Resize event
virtual void resizeEvent( QResizeEvent * ) override;
#ifdef Q_OS_MAC
virtual void showEvent( QShowEvent *event ) override;
#endif
signals:
//! Is emitted every time the view zoom has changed
void zoomLevelChanged();