Changeset 807

Timestamp:

Oct 27, 2010, 1:18:56 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

 

Location:

trunk

Files:

• README.OS2 (modified) (4 diffs)
• src/gui/kernel/qwidget_pm.cpp (modified) (1 diff)
• src/gui/kernel/qwidget_win.cpp (modified) (1 diff)

trunk/README.OS2 ¶

@@ -89 +89 @@
 
     Note that you will also need libc064x.dll for this PostgresSQL build and a
-    patched PostgresSQL DLL that fixes one critical bug (this will not be
+    patched PostgresSQL library that fixes one critical bug (this will not be
     necessary for the next PostgresSQL build as it will incorporate the fix):
 
       http://download.smedley.info/libc064x.zip
-      http://smedley.info/libpq.zip
+      http://download.smedley.info/libpq.zip
 
     Note that you will also need the above OpenSSL libraries and pthread.lib to
@@ -197 +197 @@
       set MYSQL_LIBS=-L<path_to_MySQL>\lib -lmysqlclient_r -L<path_to_OpenSSL>\lib -llibssl -llibcrypto -L<path_to_pthread> -lpthread
 
-    Also add MySQL DLLs to BEGINLIBPATH if they are not already there as shown
-    above.
-
   - Unzip the PostgresSQL archive to some directory and set the following
     environment variables to tell the Qt configure script the library location:
@@ -205 +202 @@
       set PSQL_INCLUDEPATH=<path_to_PostgresSQL>\include'
       set PSQL_LIBS=-L<path_to_PostgresSQL>\lib -llibpq -L<path_to_OpenSSL>\lib -llibssl -llibcrypto -L<path_to_pthread> -lpthread
-
-    Also add PostgresSQL DLLs to BEGINLIBPATH if they are not already there as
-    shown above.
 
 
@@ -436 +430 @@
                               - BLIT (slower than both FB and FBSWM but prevents
                                 screen corruption under the mouse pointer and
-                                does not produce a mouse pointer flicker
+                                does not produce the mouse pointer flicker
                                 effect).
 

trunk/src/gui/kernel/qwidget_pm.cpp ¶

@@ -1824 +1824 @@
         ULONG fl = SWP_HIDE;
         if (q->isWindow() && frameWinId() != NULLHANDLE) {
-            if (!(q->windowFlags() & Qt::Popup))
+            if ((q->windowFlags() & Qt::Popup) != Qt::Popup)
                 fl |= SWP_DEACTIVATE;
         }

trunk/src/gui/kernel/qwidget_win.cpp ¶

@@ -1059 +1059 @@
 #endif
     if (q->windowFlags() != Qt::Desktop) {
-        if ((q->windowFlags() & Qt::Popup) && q->internalWinId())
+        if ((q->windowFlags() & Qt::Popup) == Qt::Popup && q->internalWinId())
             ShowWindow(q->internalWinId(), SW_HIDE);
         else if (q->internalWinId())