Skip to content

Commit

Permalink
[skip ci] minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
wwmayer committed Nov 18, 2019
1 parent 71dbf6e commit ef73ab5
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/Gui/Application.cpp
Expand Up @@ -1748,13 +1748,8 @@ void Application::runApplication(void)
std::map<std::string,std::string>::const_iterator it;

#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
#endif

// A new QApplication
Base::Console().Log("Init: Creating Gui::Application and QApplication\n");

#if defined(QTWEBENGINE) && defined(Q_OS_LINUX)
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
#elif defined(QTWEBENGINE) && defined(Q_OS_LINUX)
// Avoid warning of 'Qt WebEngine seems to be initialized from a plugin...'
// QTWEBENGINE is defined in src/Gui/CMakeLists.txt, currently only enabled
// when build with Conda.
Expand All @@ -1773,6 +1768,9 @@ void Application::runApplication(void)
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif

// A new QApplication
Base::Console().Log("Init: Creating Gui::Application and QApplication\n");

// if application not yet created by the splasher
int argc = App::Application::GetARGC();
GUISingleApplication mainApp(argc, App::Application::GetARGV());
Expand Down

0 comments on commit ef73ab5

Please sign in to comment.