blob: 73e413941f9dbe849185ea388c04ec814604d541 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
$NetBSD: patch-ad,v 1.11 2010/11/15 13:05:45 adam Exp $
--- src/corelib/global/qglobal.h.orig 2010-09-10 09:05:25.000000000 +0000
+++ src/corelib/global/qglobal.h
@@ -159,6 +159,7 @@ namespace QT_NAMESPACE {}
NETBSD - NetBSD
OPENBSD - OpenBSD
BSDI - BSD/OS
+ INTERIX - Interix
IRIX - SGI Irix
OSF - HP Tru64 UNIX
SCO - SCO OpenServer 5
@@ -224,6 +225,9 @@ namespace QT_NAMESPACE {}
#elif defined(__NetBSD__)
# define Q_OS_NETBSD
# define Q_OS_BSD4
+#elif defined(__INTERIX)
+# define Q_OS_INTERIX
+# define Q_OS_BSD4
#elif defined(__OpenBSD__)
# define Q_OS_OPENBSD
# define Q_OS_BSD4
@@ -266,8 +270,6 @@ namespace QT_NAMESPACE {}
#endif
#if defined(Q_OS_DARWIN)
-# define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */
-# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/
# if defined(Q_OS_DARWIN64)
# define Q_OS_MAC64
# elif defined(Q_OS_DARWIN32)
@@ -804,8 +806,6 @@ namespace QT_NAMESPACE {}
# 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)
-# define Q_WS_MAC
-# define Q_WS_MACX
# if defined(Q_OS_MAC64)
# define Q_WS_MAC64
# elif defined(Q_OS_MAC32)
|
