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 #2509 from SebDieBln/FixTipWindow

Browse Source 
initialize tip window with correct parent widget (fixes #8312) (fixes #8365)
This commit is contained in:
Nathan Woodrow 2016-01-28 06:22:02 +10:00
commit 95b26663f6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/qgisapp.cpp
View File

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

8
src/app/qgstipgui.cpp
View File

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

2
src/app/qgstipgui.h
View File

@ -24,7 +24,7 @@ class APP_EXPORT QgsTipGui : public QDialog, private Ui::QgsTipGuiBase
{
Q_OBJECT
public:
QgsTipGui();
QgsTipGui( QWidget *parent = nullptr );
~QgsTipGui();
private: