From 77697cb46ca8744e89cadadae81ee8c0df3e2dbd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 15 Feb 2024 12:41:38 +0900 Subject: Remove original Q_WS_* defines Signed-off-by: Michele Calgaro --- doc/html/qglobal-h.html | 11 ----------- src/tools/ntqglobal.h | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 2a3a3a13d..95ae1ea77 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -598,36 +598,27 @@ body { background: #ffffff; color: black; } */ #if defined(Q_OS_MAC9) -# define Q_WS_MAC9 # define TQ_WS_MAC9 #elif defined(Q_OS_MSDOS) -# define Q_WS_WIN16 # define TQ_WS_WIN16 # error "TQt requires Win32 and does not work with Windows 3.x" #elif defined(_WIN32_X11_) -# define Q_WS_X11 # define TQ_WS_X11 #elif defined(Q_OS_WIN32) -# define Q_WS_WIN32 # define TQ_WS_WIN32 # if defined(Q_OS_WIN64) -# define Q_WS_WIN64 # define TQ_WS_WIN64 # endif #elif defined(Q_OS_OS2) -# define Q_WS_PM # define TQ_WS_PM # error "TQt does not work with OS/2 Presentation Manager or Workplace Shell" #elif defined(Q_OS_UNIX) # if defined(TQWS) -# define Q_WS_QWS # define TQ_WS_QWS # define TQT_NO_QWS_IM # elif defined(Q_OS_MACX) -# define Q_WS_MACX # define TQ_WS_MACX # else -# define Q_WS_X11 # define TQ_WS_X11 # endif #endif @@ -636,12 +627,10 @@ body { background: #ffffff; color: black; } #endif #if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32) -# define Q_WS_WIN # define TQ_WS_WIN #endif #if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) && !defined(TQ_WS_QWS) && !defined(TQ_WS_X11) -# define Q_WS_MAC # define TQ_WS_MAC #endif diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index 1eb559919..18aa92386 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -564,36 +564,27 @@ */ #if defined(Q_OS_MAC9) -# define Q_WS_MAC9 # define TQ_WS_MAC9 #elif defined(Q_OS_MSDOS) -# define Q_WS_WIN16 # define TQ_WS_WIN16 # error "TQt requires Win32 and does not work with Windows 3.x" #elif defined(_WIN32_X11_) -# define Q_WS_X11 # define TQ_WS_X11 #elif defined(Q_OS_WIN32) -# define Q_WS_WIN32 # define TQ_WS_WIN32 # if defined(Q_OS_WIN64) -# define Q_WS_WIN64 # define TQ_WS_WIN64 # endif #elif defined(Q_OS_OS2) -# define Q_WS_PM # define TQ_WS_PM # error "TQt does not work with OS/2 Presentation Manager or Workplace Shell" #elif defined(Q_OS_UNIX) # if defined(TQWS) -# define Q_WS_QWS # define TQ_WS_QWS # define TQT_NO_QWS_IM # elif defined(Q_OS_MACX) -# define Q_WS_MACX # define TQ_WS_MACX # else -# define Q_WS_X11 # define TQ_WS_X11 # endif #endif @@ -602,12 +593,10 @@ #endif #if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32) -# define Q_WS_WIN # define TQ_WS_WIN #endif #if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) && !defined(TQ_WS_QWS) && !defined(TQ_WS_X11) -# define Q_WS_MAC # define TQ_WS_MAC #endif -- cgit v1.2.1