diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qt_tools.pri | 6 | ||||
| -rw-r--r-- | src/tools/tqglobal.h | 16 | ||||
| -rw-r--r-- | src/tools/tqlibrary.cpp | 3 |
3 files changed, 1 insertions, 24 deletions
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri index 702e575f7..a01835953 100644 --- a/src/tools/qt_tools.pri +++ b/src/tools/qt_tools.pri @@ -138,11 +138,5 @@ tools { $$TOOLS_CPP/tqunicodetables.cpp \ $$TOOLS_CPP/tqucom.cpp \ $$TOOLS_CPP/tquuid.cpp - - irix-cc* { - CXXFLAGS_PRELINK = $$QMAKE_CXXFLAGS - CXXFLAGS_PRELINK -= -O2 - QMAKE_PRE_LINK = $(CXX) -c $$CXXFLAGS_PRELINK -O1 $(INCPATH) -o $(OBJECTS_DIR)/tqlocale.o tools/tqlocale.cpp - } } diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h index ff0d7d835..1f98a5d85 100644 --- a/src/tools/tqglobal.h +++ b/src/tools/tqglobal.h @@ -65,7 +65,6 @@ NETBSD - NetBSD OPENBSD - OpenBSD BSDI - BSD/OS - IRIX - SGI Irix UNIXWARE - UnixWare 7, Open UNIX 8 AIX - AIX HURD - GNU Hurd @@ -120,8 +119,6 @@ #elif defined(__bsdi__) # define Q_OS_BSDI # define Q_OS_BSD4 -#elif defined(__sgi) -# define Q_OS_IRIX #elif defined(_AIX) # define Q_OS_AIX #elif defined(__Lynx__) @@ -331,19 +328,6 @@ # define Q_CC_OC # define Q_NO_USING_KEYWORD -/* The MIPSpro compiler in o32 mode is based on EDG but disables features - such as template specialization nevertheless */ -# elif defined(__sgi) -# define Q_CC_MIPS -# if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */ -# define TQ_TYPENAME -# elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */ -# define TQ_TYPENAME -# endif -# define Q_NO_USING_KEYWORD /* ### check "using" status */ -# if defined(_COMPILER_VERSION) && (_COMPILER_VERSION >= 740) -# pragma set woff 3624,3625, 3649 /* turn off some harmless warnings */ -# endif # endif /* The older UnixWare 2.X compiler? */ diff --git a/src/tools/tqlibrary.cpp b/src/tools/tqlibrary.cpp index 65e2f5326..d2b038af8 100644 --- a/src/tools/tqlibrary.cpp +++ b/src/tools/tqlibrary.cpp @@ -57,8 +57,7 @@ #endif #if (defined(TQ_WS_WIN) && !defined(QT_MAKEDLL)) \ - || (defined(Q_OS_FREEBSD) && defined(Q_CC_INTEL)) \ - || (defined(Q_OS_IRIX) && defined(Q_CC_GNU)) + || (defined(Q_OS_FREEBSD) && defined(Q_CC_INTEL)) #define TQT_NO_LIBRARY_UNLOAD #endif |
