diff options
Diffstat (limited to 'src/tools/ntqglobal.h')
| -rw-r--r-- | src/tools/ntqglobal.h | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index f249b7050..edd27d431 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -552,7 +552,7 @@ /* - The window system, must be one of: (Q_WS_x) + The window system, must be one of: (TQ_WS_x) MACX - Mac OS X MAC9 - Mac OS 9 @@ -565,39 +565,50 @@ #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 #if defined(Q_OS_MAC) && !defined(TQMAC_PASCAL) # define TQMAC_PASCAL #endif -#if defined(Q_WS_WIN16) || defined(Q_WS_WIN32) +#if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32) # define Q_WS_WIN +# define TQ_WS_WIN #endif -#if (defined(Q_WS_MAC9) || defined(Q_WS_MACX)) && !defined(Q_WS_QWS) && !defined(Q_WS_X11) +#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 @@ -802,7 +813,7 @@ class TQString; # define TQT_NO_SQL #endif -#if defined(Q_WS_MAC9) +#if defined(TQ_WS_MAC9) //No need for menu merging # ifndef TQMAC_QMENUBAR_NO_MERGE # define TQMAC_QMENUBAR_NO_MERGE @@ -815,7 +826,7 @@ class TQString; # define TQMAC_QMENUBAR_NO_EVENT # endif #endif -#if defined(Q_WS_MACX) //for no nobody uses quartz, just putting in first level hooks +#if defined(TQ_WS_MACX) //for no nobody uses quartz, just putting in first level hooks # ifndef TQMAC_NO_QUARTZ # define TQMAC_NO_QUARTZ # endif @@ -824,7 +835,7 @@ class TQString; # endif #endif -#if !defined(Q_WS_QWS) && !defined(TQT_NO_COP) +#if !defined(TQ_WS_QWS) && !defined(TQT_NO_COP) # define TQT_NO_COP #endif @@ -891,7 +902,7 @@ class TQString; // Some platform specific stuff // -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) extern TQ_EXPORT bool qt_winunicode; #endif @@ -905,7 +916,7 @@ TQ_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian ); TQ_EXPORT bool tqSharedBuild(); #if defined(Q_OS_MAC) int qMacVersion(); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) TQ_EXPORT int qWinVersion(); #if defined(UNICODE) #define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi } |