From 07b4a1977d75add5a968cdeb17875459798a795d Mon Sep 17 00:00:00 2001 From: Alexey Shilov Date: Mon, 27 Jun 2011 11:34:46 +0300 Subject: [PATCH] Fixes: NB#267391 - Boosting prevents QML apps from dropping the GL context on background RevBy: Olli Leppanen --- debian/changelog | 2 +- src/qdeclarativebooster/mdeclarativecache.cpp | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 78ab2ec..e1fa131 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ applauncherd (0.30.5) unstable; urgency=low - * + * Fixes: NB#267391 - Boosting prevents QML apps from dropping the GL context on background -- Alexey Shilov Mon, 27 Jun 2011 13:28:30 +0300 diff --git a/src/qdeclarativebooster/mdeclarativecache.cpp b/src/qdeclarativebooster/mdeclarativecache.cpp index 3a63df5..fca208d 100644 --- a/src/qdeclarativebooster/mdeclarativecache.cpp +++ b/src/qdeclarativebooster/mdeclarativecache.cpp @@ -82,17 +82,8 @@ void MDeclarativeCachePrivate::populate() qApplicationInstance = new QApplication(initialArgc, initialArgv); } - bool default_widget_creation = QCoreApplication::testAttribute(Qt::AA_ImmediateWidgetCreation); - - if (!default_widget_creation) - { - QCoreApplication::setAttribute(Qt::AA_ImmediateWidgetCreation, true); - } - qDeclarativeViewInstance = new QDeclarativeView(); - // restore default value - QCoreApplication::setAttribute(Qt::AA_ImmediateWidgetCreation, default_widget_creation); } QApplication* MDeclarativeCachePrivate::qApplication(int &argc, char **argv) @@ -133,7 +124,6 @@ QApplication* MDeclarativeCachePrivate::qApplication(int &argc, char **argv) break; } } - bool loadTestabilityEnv = !qgetenv("QT_LOAD_TESTABILITY").isNull(); if (loadTestabilityEnv || loadTestabilityArg) @@ -146,6 +136,8 @@ QApplication* MDeclarativeCachePrivate::qApplication(int &argc, char **argv) Display *display = QX11Info::display(); if (display) { + + qDeclarativeViewInstance->winId(); XSetCommand(display, qDeclarativeViewInstance->effectiveWinId(), argv, argc); // set correct WM_CLASS properties