Changeset 364 for trunk/src/gui/kernel/qapplication_pm.cpp

Timestamp:

Nov 30, 2009, 10:40:50 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: Don't assert if qt_display_ps() is called from a non GUI thread, it should be safe now.

File:

• trunk/src/gui/kernel/qapplication_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -329 +329 @@
 void qt_init(QApplicationPrivate *priv, int)
 {
-
     int argc = priv->argc;
     char **argv = priv->argv;
@@ -354 +353 @@
     }
 
+
+
     // initialize key mapper
     QKeyMapper::changeKeyboard();
@@ -389 +390 @@
     QColormap::cleanup();
 
-    if (displayPS) {
-        WinReleasePS(displayPS);
-        displayPS = 0;
-    }
+    WinReleasePS(displayPS);
+    displayPS = 0;
 
 #ifdef QT_LOG_BLITSPEED
@@ -411 +410 @@
 Q_GUI_EXPORT HPS qt_display_ps()
 {
-    Q_ASSERT(qApp && qApp->thread() == QThread::currentThread());
-    if (!displayPS)
-        displayPS = WinGetScreenPS(HWND_DESKTOP);
+    Q_ASSERT(qApp);
+    if (!)
+        ;
     return displayPS;
 }