Changeset 17

Timestamp:

Jun 3, 2009, 7:50:42 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/global: OS/2 bits.

Location:

trunk

Files:

• mkspecs/os2-g++/qplatformdefs.h (modified) (2 diffs)
• src/corelib/global/qglobal.h (modified) (3 diffs)

trunk/mkspecs/os2-g++/qplatformdefs.h ¶

@@ -52 +52 @@
 #include <errno.h>
 #include <sys/stat.h>
+#include <sys/process.h>
 #include <stdlib.h>
 
@@ -66 +67 @@
 #define QT_STAT                 ::stat
 #define QT_FSTAT                ::fstat
+#define QT_LSTAT                ::lstat
 //#endif
 #define QT_STAT_REG             S_IFREG

trunk/src/corelib/global/qglobal.h ¶

@@ -188 +188 @@
 #  define Q_OS_MSDOS
 #elif defined(__OS2__)
-#  if defined(__EMX__)
+#  if defined(__EMX__) && !defined(__INNOTEK_LIBC__)
 #    define Q_OS_OS2EMX
 #  else
@@ -732 +732 @@
      WIN32    - Windows
      X11      - X Window System
-     PM       - unsupported
+     PM       - OS/2 Presentation Manager
      WIN16    - unsupported
 */
@@ -750 +750 @@
 #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(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS)