diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2025-01-01 13:14:26 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2025-01-08 13:00:16 +0900 |
| commit | 840945161b56783948793acd952fa48bdbddc211 (patch) | |
| tree | 8b4f96707077d236f5904add531428db3582f2c3 /src/tools | |
| parent | b3f74bb12ab86a90a05f7d48325b25c408d0b985 (diff) | |
| download | tqt-84094516.tar.gz tqt-84094516.zip | |
Remove support for Metrowerks compiler
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 37293565c31fa447fbf7cb0566be51d1204e8991)
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/ntqglobal.h | 8 | ||||
| -rw-r--r-- | src/tools/qglobal.cpp | 26 |
2 files changed, 1 insertions, 33 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index ef71a722b..49e9643e1 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -105,8 +105,6 @@ # define Q_OS_WIN64 #elif !defined(SAG_COM) && (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)) # define Q_OS_WIN32 -#elif defined(__MWERKS__) && defined(__INTEL__) -# define Q_OS_WIN32 #elif defined(__sun) || defined(sun) # define Q_OS_SOLARIS #elif defined(hpux) || defined(__hpux) @@ -197,7 +195,6 @@ SYM - Symantec C++ for both PC and Macintosh MPW - MPW C++ - MWERKS - Metrowerks CodeWarrior MSVC - Microsoft Visual C/C++, Intel C++ for Windows WAT - Watcom C++ GNU - GNU C++ @@ -238,11 +235,6 @@ # define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD -#elif defined(__MWERKS__) -# define Q_CC_MWERKS -/* "explicit" recognized since 4.0d1 */ -# define TQMAC_PASCAL pascal - #elif defined(_MSC_VER) # define Q_CC_MSVC /* proper support of bool for _MSC_VER >= 1100 */ diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp index 006037241..99d1ef7ca 100644 --- a/src/tools/qglobal.cpp +++ b/src/tools/qglobal.cpp @@ -447,34 +447,12 @@ static TQtMsgHandler handler = 0; // pointer to debug handler static const int QT_BUFFER_LENGTH = 8196; // internal buffer length -#ifdef Q_CC_MWERKS - -#include "qt_mac.h" - -extern bool tqt_is_gui_used; -static void mac_default_handler( const char *msg ) -{ - if ( tqt_is_gui_used ) { - const unsigned char *p = p_str(msg); - DebugStr(p); - free((void*)p); - } else { - fprintf( stderr, msg ); - } -} - -#endif - void handle_buffer(const char *buf, TQtMsgType msgType) { if ( handler ) { (*handler)( msgType, buf ); } else if (msgType == TQtFatalMsg) { -#if defined(Q_CC_MWERKS) - mac_default_handler(buf); -#else fprintf( stderr, "%s\n", buf ); // add newline -#endif #if defined(Q_OS_UNIX) && defined(QT_DEBUG) abort(); // trap; generates core dump #elif defined(Q_OS_TEMP) && defined(QT_DEBUG) @@ -487,9 +465,7 @@ void handle_buffer(const char *buf, TQtMsgType msgType) exit( 1 ); // goodbye cruel world #endif } else { -#if defined(Q_CC_MWERKS) - mac_default_handler(buf); -#elif defined(Q_OS_TEMP) +#if defined(Q_OS_TEMP) TQString fstr( buf ); OutputDebugString( (fstr + "\n").ucs2() ); #else |