mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-26 00:02:08 -05:00
Fixed splash screen display on win32
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1945 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
d5f10a4916
commit
eaf4c3c995
@ -266,11 +266,13 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare
|
||||
//
|
||||
QSettings settings;
|
||||
bool myHideSplashFlag = false;
|
||||
if (settings.readEntry("/qgis/hideSplash")=="true") { myHideSplashFlag=true; }
|
||||
myHideSplashFlag = settings.readBoolEntry("/qgis/hideSplash");
|
||||
|
||||
if (!myHideSplashFlag)
|
||||
{
|
||||
gSplashScreen = new SplashScreen(); //this is supposed to be instantiated in main.cpp but we get segfaults...
|
||||
gSplashScreen->setStatus(tr("Loading QGIS..."));
|
||||
qApp->processEvents();
|
||||
}
|
||||
|
||||
// register all GDAL and OGR plug-ins
|
||||
|
@ -22,7 +22,7 @@
|
||||
#include "qfont.h"
|
||||
#include "qgis.h"
|
||||
#ifdef WIN32
|
||||
QString PKGDATAPATH = qApp->applicationDirPath() + "/qgis/share";
|
||||
QString PKGDATAPATH = qApp->applicationDirPath() + "/share/qgis";
|
||||
#endif
|
||||
SplashScreen::SplashScreen():QWidget(0, 0, WStyle_Customize | WStyle_Splash)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user