Merge pull request #4292 from Gustry/fix_mac_build

fix undeclared identifier on MAC in composer

Author: dakcarto

src/app/composer/qgscomposer.cpp

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

src/app/composer/qgscomposer.h

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