Merge pull request #2509 from SebDieBln/FixTipWindow

initialize tip window with correct parent widget (fixes #8312) (fixes #8365)
qgis · Jan 27, 2016 · 95b2666 · 95b2666
2 parents bc4d16e + 4c24792
commit 95b2666
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -916,7 +916,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   if ( settings.value( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), true ).toBool() )
   {
     mSplash->hide();
-    QgsTipGui myTip;
+    QgsTipGui myTip( this );
     myTip.exec();
   }
   else

diff --git a/src/app/qgstipgui.cpp b/src/app/qgstipgui.cpp
@@ -24,11 +24,11 @@
 #include <qgstipfactory.h>
 
 #ifdef Q_OS_MACX
-QgsTipGui::QgsTipGui()
-    : QDialog( nullptr, Qt::WindowSystemMenuHint )  // Modeless dialog with close button only
+QgsTipGui::QgsTipGui( QWidget *parent )
+    : QDialog( parent, Qt::WindowSystemMenuHint )  // Dialog with close button only
 #else
-QgsTipGui::QgsTipGui()
-    : QDialog( nullptr )  // Normal dialog in non Mac-OS
+QgsTipGui::QgsTipGui( QWidget *parent )
+    : QDialog( parent )  // Normal dialog in non Mac-OS
 #endif
 {
   setupUi( this );

diff --git a/src/app/qgstipgui.h b/src/app/qgstipgui.h
@@ -24,7 +24,7 @@ class APP_EXPORT QgsTipGui : public QDialog, private Ui::QgsTipGuiBase
 {
     Q_OBJECT
   public:
-    QgsTipGui();
+    QgsTipGui( QWidget *parent = nullptr );
     ~QgsTipGui();
 
   private: