blob: be5ee6017329c647434acb44d2293d7e83de7fdc (
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
41
42
43
44
45
46
|
$NetBSD: patch-ad,v 1.4 2007/03/18 17:34:41 adam Exp $
--- src/corelib/global/qglobal.h.orig 2006-11-27 17:26:05.000000000 +0000
+++ src/corelib/global/qglobal.h
@@ -55,6 +55,7 @@
NETBSD - NetBSD
OPENBSD - OpenBSD
BSDI - BSD/OS
+ INTERIX - Interix
IRIX - SGI Irix
OSF - HP Tru64 UNIX
SCO - SCO OpenServer 5
@@ -107,6 +108,9 @@
#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
@@ -146,11 +150,6 @@
# define Q_OS_WIN
#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.*/
-#endif
-
#if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN)
# undef Q_OS_UNIX
#elif !defined(Q_OS_UNIX)
@@ -542,10 +541,7 @@
# 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_DARWIN) && !defined(__USE_WS_X11__)
-# define Q_WS_MAC
-# define Q_WS_MACX
-# elif !defined(Q_WS_QWS)
+# if !defined(Q_WS_QWS)
# define Q_WS_X11
# endif
#endif
|
