Changeset 8 for trunk/include/qglobal.h

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/include/qglobal.h (modified) (3 diffs)

trunk/include/qglobal.h

@@ -93 +93 @@
 #  define Q_OS_MSDOS
 #elif defined(__OS2__)
-#  if defined(__EMX__)
+#  if defined(__EMX__) && !defined(__INNOTEK_LIBC__)
 #    define Q_OS_OS2EMX
 #  else
@@ -532 +532 @@
      WIN32      - Windows
      X11        - X Window System
-     PM         - unsupported
+     PM         - OS/2 Presentation Manager
      WIN16      - unsupported
 */
@@ -550 +550 @@
 #elif defined(Q_OS_OS2)
 #  define Q_WS_PM
-#  error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
 #elif defined(Q_OS_UNIX)
 #  if defined(QWS)