Skip to content
Permalink
Browse files
Merge pull request #4292 from Gustry/fix_mac_build
fix undeclared identifier on MAC in composer
  • Loading branch information
dakcarto committed Mar 22, 2017
2 parents 060a57f + 1196377 commit 265da3ffa0f2c5346cbee3d1178f4199655a3af8
Showing with 0 additions and 15 deletions.
  1. +0 −11 src/app/composer/qgscomposer.cpp
  2. +0 −4 src/app/composer/qgscomposer.h
@@ -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;
@@ -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();

0 comments on commit 265da3f

Please sign in to comment.