diff -r d3fb69e31165 -r 1dc160048a0c QTfrontend/main.cpp --- a/QTfrontend/main.cpp Fri Oct 06 17:36:03 2017 +0200 +++ b/QTfrontend/main.cpp Fri Oct 06 19:12:23 2017 +0200 @@ -44,6 +44,11 @@ #include #elif defined __APPLE__ #include "CocoaInitializer.h" + +#endif + +#ifdef Q_OS_WIN +#include #endif // Program resources @@ -162,9 +167,8 @@ HWApplication app(argc, argv); app.setAttribute(Qt::AA_DontShowIconsInMenus,false); - // file engine and splash. to be initialized later + // file engine, to be initialized later engine = NULL; - QLabel *splash = NULL; // parse arguments @@ -241,17 +245,13 @@ // end of parameter parsing -#if defined Q_OS_WIN - QPixmap pixmap(":res/splash.png"); - splash = new QLabel(0, Qt::FramelessWindowHint|Qt::WindowStaysOnTopHint); - splash->setAttribute(Qt::WA_TranslucentBackground); - const QRect deskSize = HWApplication::desktop()->screenGeometry(-1); - QPoint splashCenter = QPoint( (deskSize.width() - pixmap.width())/2, - (deskSize.height() - pixmap.height())/2 ); - splash->move(splashCenter); - splash->setPixmap(pixmap); - splash->show(); + +#ifdef Q_OS_WIN + QPixmap pixmap(":/res/splash.png"); + QSplashScreen splash(pixmap); + splash.show(); #endif + app.setStyle(new QPlastiqueStyle()); QDateTime now = QDateTime::currentDateTime(); @@ -393,9 +393,11 @@ qWarning("Starting Hedgewars %s-r%d (%s)", qPrintable(*cVersionString), cRevisionString->toInt(), qPrintable(*cHashString)); app.form = new HWForm(NULL, style); +#ifdef Q_OS_WIN + splash.finish(app.form); +#endif app.form->show(); - if(splash) - splash->close(); + if (app.urlString) app.fakeEvent(); return app.exec();