diff --git a/config.tests/unix/largefile/largefiletest.cpp b/config.tests/unix/largefile/largefiletest.cpp index ed04e7a4a..b3626621a 100644 --- a/config.tests/unix/largefile/largefiletest.cpp +++ b/config.tests/unix/largefile/largefiletest.cpp @@ -18,7 +18,6 @@ int main( int, char **argv ) if (OFF_T_64 % 2147483647 != 1) return 1; - // stat breaks on SCO OpenServer struct stat buf; stat( argv[0], &buf ); if (!S_ISREG(buf.st_mode)) diff --git a/configure b/configure index dbece6eb3..c03fab755 100755 --- a/configure +++ b/configure @@ -1165,13 +1165,6 @@ if [ -z "$PLATFORM" ]; then - Also available for HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64 " ;; - OSF1:*) - #PLATFORM=tru64-g++ - PLATFORM=tru64-cxx - PLATFORM_NOTES=" - - Also available for Tru64: tru64-g++ - " - ;; Linux:*|GNU:*|GNU/*:*) PLATFORM=linux-g++ PLATFORM_NOTES=" @@ -1206,13 +1199,6 @@ if [ -z "$PLATFORM" ]; then - Also available for UnixWare: unixware-g++ " ;; - SCO_SV:*) - #PLATFORM=sco-g++ - PLATFORM=sco-cc - PLATFORM_NOTES=" - - Also available for SCO OpenServer: sco-g++ - " - ;; UNIX_SV:*) PLATFORM=unixware-g++ ;; @@ -2115,9 +2101,6 @@ if true; then ###[ '!' -f "$outpath/bin/tqmake" ]; EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS) -DQT_MACOSX_VERSION=$QT_MAC_VERSION" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS) -DQT_MACOSX_VERSION=$QT_MAC_VERSION" EXTRA_SOURCES="tqurl.o tqsettings_mac.o" - elif [ "$PLATFORM" = "tru64-cxx" ]; then - echo "OSF_LFLAGS = -lm" >>$mkfile - EXTRA_LFLAGS="$EXTRA_LFLAGS \$(OSF_LFLAGS)" elif [ "$PLATFORM_QNX" = "yes" ]; then echo "QNX_LFLAGS += -fhonor-std -fno-builtins -pipe" >>$mkfile echo "QNX_CFLAGS += -lcpp" >>$mkfile diff --git a/doc/html/qmake-manual-2.html b/doc/html/qmake-manual-2.html index f51ae67b8..ed82475eb 100644 --- a/doc/html/qmake-manual-2.html +++ b/doc/html/qmake-manual-2.html @@ -37,7 +37,7 @@ body { background: #ffffff; color: black; }

Before building TQt manually the following environment variables must be set:

Once the environment variables are set go into the qmake directory, $TQTDIR/qmake, e.g. C:\qt\qmake. Now run make or nmake depending on your compiler.

When the make has completed, qmake is ready for use.

diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html index df234edc5..05f45cac4 100644 --- a/doc/html/tqglobal-h.html +++ b/doc/html/tqglobal-h.html @@ -102,8 +102,6 @@ body { background: #ffffff; color: black; } OPENBSD - OpenBSD BSDI - BSD/OS IRIX - SGI Irix - OSF - HP Tru64 UNIX - SCO - SCO OpenServer 5 UNIXWARE - UnixWare 7, Open UNIX 8 AIX - AIX HURD - GNU Hurd @@ -161,8 +159,6 @@ body { background: #ffffff; color: black; } # define Q_OS_BSD4 #elif defined(__sgi) # define Q_OS_IRIX -#elif defined(__osf__) -# define Q_OS_OSF #elif defined(_AIX) # define Q_OS_AIX #elif defined(__Lynx__) @@ -175,9 +171,7 @@ body { background: #ffffff; color: black; } # define Q_OS_QNX #elif defined(_SEQUENT_) # define Q_OS_DYNIX -#elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */ -# define Q_OS_SCO -#elif defined(__USLC__) /* all SCO platforms + UDK or OUDK */ +#elif defined(__USLC__) /* UDK or OUDK */ # define Q_OS_UNIXWARE # define Q_OS_UNIXWARE7 #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */ @@ -236,7 +230,7 @@ body { background: #ffffff; color: black; } DEC - DEC C++ HP - HPUX C++ HPACC - HPUX ANSI C++ - USLC - SCO OUDK, UDK, and UnixWare 2.X C++ + USLC - UDK, and UnixWare 2.X C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows HIGHC - MetaWare High C/C++ @@ -372,36 +366,6 @@ body { background: #ffffff; color: black; } # define Q_CANNOT_DELETE_CONSTANT # endif -/* Older versions of DEC C++ do not define __EDG__ or __EDG - observed - on DEC C++ V5.5-004. New versions do define __EDG__ - observed on - Compaq C++ V6.3-002. - This compiler is different enough from other EDG compilers to handle - it separately anyway. */ -#elif defined(__DECCXX) || defined(__DECC) -# define Q_CC_DEC -/* Compaq C++ V6 compilers are EDG-based but I'm not sure about older - DEC C++ V5 compilers. */ -# if defined(__EDG__) -# define Q_CC_EDG -# endif -/* Compaq have disabled EDG's _BOOL macro and use _BOOL_EXISTS instead - - observed on Compaq C++ V6.3-002. - In any case versions prior to Compaq C++ V6.0-005 do not have bool. */ -# if !defined(_BOOL_EXISTS) -# define Q_NO_BOOL_TYPE -# endif -/* Spurious (?) error messages observed on Compaq C++ V6.5-014. */ -# define Q_NO_USING_KEYWORD -/* Apply to all versions prior to Compaq C++ V6.0-000 - observed on - DEC C++ V5.5-004. */ -# if __DECCXX_VER < 60060000 -# define TQ_TYPENAME -# define Q_BROKEN_TEMPLATE_SPECIALIZATION -# define Q_CANNOT_DELETE_CONSTANT -# endif -/* avoid undefined symbol problems with out-of-line template members */ -# define TQ_INLINE_TEMPLATES inline - /* Compilers with EDG front end are similar. To detect them we test: __EDG documented by SGI, observed on MIPSpro 7.3.1.1 and KAI C++ 4.0b __EDG__ documented in EDG online docs, observed on Compaq C++ V6.3-002 */ diff --git a/doc/html/tqstyle.html b/doc/html/tqstyle.html index be1169606..c539dfd9d 100644 --- a/doc/html/tqstyle.html +++ b/doc/html/tqstyle.html @@ -365,7 +365,7 @@ header
  • TQStyle::PE_ScrollBarAddLine - scrollbar line increase indicator (i.e. scroll down); see also TQScrollBar.
  • TQStyle::PE_ScrollBarSubLine - scrollbar line decrease indicator (i.e. scroll up). -
  • TQStyle::PE_ScrollBarAddPage - scolllbar page increase indicator (i.e. page down). +
  • TQStyle::PE_ScrollBarAddPage - scrollbar page increase indicator (i.e. page down).
  • TQStyle::PE_ScrollBarSubPage - scrollbar page decrease indicator (i.e. page up).
  • TQStyle::PE_ScrollBarSlider - scrollbar slider
  • TQStyle::PE_ScrollBarFirst - scrollbar first line indicator (i.e. home). @@ -433,7 +433,7 @@ behave as appropriate for each control. value. If TRUE, when clicking a scrollbar SubControl, holding the mouse button down and moving the pointer outside the SubControl, the scrollbar continues to scroll. If FALSE, the -scollbar stops scrolling when the pointer leaves the +scrollbar stops scrolling when the pointer leaves the SubControl.
  • TQStyle::SH_TabBar_Alignment - the alignment for tabs in a TQTabWidget. Possible values are TQt::AlignLeft, TQt::AlignCenter and TQt::AlignRight. @@ -485,7 +485,7 @@ cause a tab to be selected.
  • TQStyle::SH_ListViewExpand_SelectMouseType - which type of mouse event should cause a listview expansion to be selected.
  • TQStyle::SH_TabBar_PreferNoArrows - whether a tabbar should suggest a size -to prevent scoll arrows. +to prevent scroll arrows.
  • TQStyle::SH_ComboBox_Popup - allows popups as a combobox dropdown menu.
  • TQStyle::SH_Workspace_FillSpaceOnMaximize - the workspace should diff --git a/doc/man/man3/tqstyle.3qt b/doc/man/man3/tqstyle.3qt index 6d1d18a8b..194a2e6ac 100644 --- a/doc/man/man3/tqstyle.3qt +++ b/doc/man/man3/tqstyle.3qt @@ -454,7 +454,7 @@ This enum represents the PrimitiveElements of a style. A PrimitiveElement is a c .TP \fCTQStyle::PE_ScrollBarSubLine\fR - scrollbar line decrease indicator (i.e. scroll up). .TP -\fCTQStyle::PE_ScrollBarAddPage\fR - scolllbar page increase indicator (i.e. page down). +\fCTQStyle::PE_ScrollBarAddPage\fR - scrollbar page increase indicator (i.e. page down). .TP \fCTQStyle::PE_ScrollBarSubPage\fR - scrollbar page decrease indicator (i.e. page up). .TP @@ -582,7 +582,7 @@ This enum represents a StyleHint. A StyleHint is a general look and/or feel hint .TP \fCTQStyle::SH_ListViewExpand_SelectMouseType\fR - which type of mouse event should cause a listview expansion to be selected. .TP -\fCTQStyle::SH_TabBar_PreferNoArrows\fR - whether a tabbar should suggest a size to prevent scoll arrows. +\fCTQStyle::SH_TabBar_PreferNoArrows\fR - whether a tabbar should suggest a size to prevent scroll arrows. .TP \fCTQStyle::SH_ComboBox_Popup\fR - allows popups as a combobox dropdown menu. .TP diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf deleted file mode 100644 index 479b7e440..000000000 --- a/mkspecs/sco-cc/qmake.conf +++ /dev/null @@ -1,78 +0,0 @@ -# -# -# qmake configuration for sco-cc -# -# Written for SCO OpenServer with UDK. -# -# -Wf,--diag_suppress,838 -# turns off warning about missing return types in X headers -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl - -QMAKE_CC = cc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -KPIC -QMAKE_CFLAGS_YACC = -Wf,--diag_suppress,111 -Wf,--diag_suppress,177 - -QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -Tused -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = /usr/X/lib -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = CC -QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -G -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt - -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cq -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h deleted file mode 100644 index 0f0fd0c5c..000000000 --- a/mkspecs/sco-cc/qplatformdefs.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef TQPLATFORMDEFS_H -#define TQPLATFORMDEFS_H - -// Get TQt defines/settings - -#include "tqglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// On Unixware header files and are not -// included by . Note that must be included -// before . -#include -#include -#include - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T size_t - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf deleted file mode 100644 index 0bc7616a1..000000000 --- a/mkspecs/sco-g++/qmake.conf +++ /dev/null @@ -1,75 +0,0 @@ -# -# -# qmake configuration for sco-g++ -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl - -QMAKE_CC = gcc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -W -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -fPIC -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -G -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE -QMAKE_RPATH = - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm -QMAKE_LIBS_QT = -lqt - -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h deleted file mode 100644 index 12d956f4b..000000000 --- a/mkspecs/sco-g++/qplatformdefs.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef TQPLATFORMDEFS_H -#define TQPLATFORMDEFS_H - -// Get TQt defines/settings - -#include "tqglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -// This is to have PATH_MAX defined in -#ifndef _IBCS2 -# define _IBCS2 -#endif - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// On Unixware header files and are not -// included by . Note that must be included -// before . -#include -#define class r_class // SCO OpenServer 5.0.6 -#include -#undef class -#include - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf - -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf deleted file mode 100644 index 2f8b8f54d..000000000 --- a/mkspecs/tru64-cxx/qmake.conf +++ /dev/null @@ -1,80 +0,0 @@ -# -# -# tmake configuration for tru64-cxx -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl plugin_no_soname - -QMAKE_CC = cxx -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -QMAKE_CFLAGS_YACC = -Olimit 1000 -QMAKE_CFLAGS_THREAD = -pthread - -QMAKE_CXX = cxx -QMAKE_CXXFLAGS = -x cxx $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = cxx -QMAKE_LINK_SHLIB = cxx -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_THREAD = -pthread -QMAKE_LFLAGS_SONAME = -soname$$LITERAL_WHITESPACE -QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE - -QMAKE_LIBS = -lm -QMAKE_LIBS_DYNLOAD = -QMAKE_LIBS_X11 = -lXext -lX11 -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_QT_THREAD = -ltqt-mt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_LIBS_THREAD = -lrt - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/tru64-cxx/qplatformdefs.h b/mkspecs/tru64-cxx/qplatformdefs.h deleted file mode 100644 index 0a7f6673f..000000000 --- a/mkspecs/tru64-cxx/qplatformdefs.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef TQPLATFORMDEFS_H -#define TQPLATFORMDEFS_H - -// Get TQt defines/settings - -#include "tqglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -#include - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#if defined(_XOPEN_SOURCE) && defined(_OSF_SOURCE) -// Not available in the header file of Tru64 4.0F. -// Fixed in the header of Tru64 5.0A so we copy/paste from there... -extern "C" int usleep(useconds_t); -#endif - -#if defined(_POSIX_PII_SOCKET) -#define QT_SOCKLEN_T socklen_t -#elif defined(_XOPEN_SOURCE_EXTENDED) -#define QT_SOCKLEN_T size_t -#else -#define QT_SOCKLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 400) -// trying to detect Tru64 5.0 and better... -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf deleted file mode 100644 index f92e1aec0..000000000 --- a/mkspecs/tru64-g++/qmake.conf +++ /dev/null @@ -1,80 +0,0 @@ -# -# -# qmake configuration for tru64-g++ -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl plugin_no_soname - -QMAKE_CC = gcc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -W -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -fPIC -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_THREAD = -D_REENTRANT - -QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_THREAD = -QMAKE_LFLAGS_SONAME = -Wl,-soname, -QMAKE_RPATH = -Wl,-rpath, - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -QMAKE_LIBS_X11 = -lXext -lX11 -lm -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_QT_THREAD = -ltqt-mt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_LIBS_THREAD = -lpthread -lexc -lrt - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/tru64-g++/qplatformdefs.h b/mkspecs/tru64-g++/qplatformdefs.h deleted file mode 100644 index 6e91b1e20..000000000 --- a/mkspecs/tru64-g++/qplatformdefs.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef TQPLATFORMDEFS_H -#define TQPLATFORMDEFS_H - -// Get TQt defines/settings - -#include "tqglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -#include - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#if defined(_XOPEN_SOURCE) && defined(_OSF_SOURCE) -// Not available in the header file of Tru64 4.0F. -// Fixed in the header of Tru64 5.0A so we copy/paste from there... -extern "C" int usleep(useconds_t); -#endif - -#if defined(_POSIX_PII_SOCKET) -# define QT_SOCKLEN_T socklen_t -#elif defined(_XOPEN_SOURCE_EXTENDED) -# define QT_SOCKLEN_T size_t -#else -# define QT_SOCKLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 400) -// trying to detect Tru64 5.0 and better... -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - - -#endif // TQPLATFORMDEFS_H diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf index 3899232e4..e8199f97f 100644 --- a/qmake/book/qmake-install.leaf +++ b/qmake/book/qmake-install.leaf @@ -22,14 +22,14 @@ g++, you would set this environment variable to \e solaris-g++. The following is a list of environment variables available to choose from when setting QMAKESPEC: -aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ -aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ -aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ -bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc -dgux-g++ hurd-g++ linux-kcc tru64-g++ win32-watc -freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-visa -hpux-acc irix-g++ macx-g++ sco-g++ unixware-g -hpux-acc irix-n32 solaris-64 unixware7-cc +aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc +aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ +aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ +bsdi-g++ hpux-o64 linux-icc qnx-g++ win32-msvc +dgux-g++ hurd-g++ linux-kcc unixware7-g++ win32-visa +freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-g++ +hpux-acc irix-g++ macx-g++ unixware-g win32-watc +hpux-acc irix-n32 solaris-64 unixware7-cc \i TQTDIR \BR This must be set to where TQt is (or will be) installed. For example, \e {c:\\qt} and \e {\\local\\qt} diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4 index e94a29abf..4283bf097 100644 --- a/src/3rdparty/libmng/aclocal.m4 +++ b/src/3rdparty/libmng/aclocal.m4 @@ -259,7 +259,6 @@ ac_save_CC="$CC" # Don't try gcc -ansi; that turns off useful extensions and # breaks some systems' header files. # AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 # HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" @@ -390,21 +389,6 @@ case $host in rm -rf conftest* ;; -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_SAVE - AC_LANG_C - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_RESTORE]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -1151,7 +1135,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -1211,18 +1195,6 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, lt_cv_prog_cc_static='-Bstatic' ;; - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - ;; - - sco3.2v5*) - lt_cv_prog_cc_pic='-Kpic' - lt_cv_prog_cc_static='-dn' - lt_cv_prog_cc_shlib='-belf' - ;; - solaris*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' @@ -1957,43 +1929,6 @@ else old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - #Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - export_dynamic_flag_spec='${wl}-Bexport' - ;; - solaris*) # gcc --version < 3.0 without binutils cannot create self contained # shared libraries reliably, requiring libgcc.a to resolve some of @@ -2477,23 +2412,6 @@ os2*) shlibpath_var=LIBPATH ;; -osf3* | osf4* | osf5*) - version_type=osf - need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -3637,17 +3555,6 @@ openbsd*) fi ;; -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all lt_cv_file_magic_test_file=/lib/libc.so diff --git a/src/3rdparty/libmng/config.guess b/src/3rdparty/libmng/config.guess index bbb3a8dde..f75adf068 100755 --- a/src/3rdparty/libmng/config.guess +++ b/src/3rdparty/libmng/config.guess @@ -172,75 +172,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; - alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - eval $set_cc_for_build - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit 0 ;; @@ -648,19 +579,6 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; @@ -932,9 +850,6 @@ EOF Intel:Mach:3*:*) echo i386-pc-mach3 exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 diff --git a/src/3rdparty/libmng/config.sub b/src/3rdparty/libmng/config.sub index 07355291b..4d87ba463 100755 --- a/src/3rdparty/libmng/config.sub +++ b/src/3rdparty/libmng/config.sub @@ -168,26 +168,6 @@ case $os in -hiux*) os=-hiuxwe2 ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -526,10 +506,6 @@ case $basic_machine in hppa-next) os=-nextstep3 ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; hppro) basic_machine=hppa1.1-hp os=-proelf @@ -711,10 +687,6 @@ case $basic_machine in basic_machine=hppa1.1-hitachi os=-hiuxwe2 ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; pbd) basic_machine=sparc-tti ;; @@ -1052,8 +1024,8 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -luna* | -dgux* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1105,12 +1077,6 @@ case $os in -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure index b204ca02e..8bd536d25 100755 --- a/src/3rdparty/libmng/configure +++ b/src/3rdparty/libmng/configure @@ -627,7 +627,7 @@ done # NLS nuisances. # Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). +# because not all systems understand e.g. LANG=C. # Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! # Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi @@ -1247,7 +1247,7 @@ ac_save_CC="$CC" # Don't try gcc -ansi; that turns off useful extensions and # breaks some systems' header files. # AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 +# Ultrix -std1 # HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" @@ -2047,17 +2047,6 @@ openbsd*) fi ;; -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all lt_cv_file_magic_test_file=/lib/libc.so @@ -2688,59 +2677,6 @@ case $host in fi rm -rf conftest* ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2698: checking whether the C compiler needs -belf" >&5 -if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_needs_belf=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_cc_needs_belf=no -fi -rm -f conftest* - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -fi - -echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - - esac # Sed substitution that helps us do robust quoting. It backslashifies @@ -2892,7 +2828,7 @@ else # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -2952,18 +2888,6 @@ else lt_cv_prog_cc_static='-Bstatic' ;; - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - ;; - - sco3.2v5*) - lt_cv_prog_cc_pic='-Kpic' - lt_cv_prog_cc_static='-dn' - lt_cv_prog_cc_shlib='-belf' - ;; - solaris*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' @@ -3783,43 +3707,6 @@ else old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - #Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - export_dynamic_flag_spec='${wl}-Bexport' - ;; - solaris*) # gcc --version < 3.0 without binutils cannot create self contained # shared libraries reliably, requiring libgcc.a to resolve some of @@ -4306,23 +4193,6 @@ os2*) shlibpath_var=LIBPATH ;; -osf3* | osf4* | osf5*) - version_type=osf - need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -6053,7 +5923,7 @@ ccp = &g + (g ? g-g : 0); ++ccp; p = (char**) ccp; ccp = (char const *const *) p; -{ /* SCO 3.2v4 cc rejects this. */ +{ char *t; char const *s = 0 ? (char *) 0 : (char const *) 0; @@ -6794,7 +6664,7 @@ EOF cat >> $CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. +# small command number limits, like on HP-UX. ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. ac_file=1 # Number of current file. ac_beg=1 # First line for current file. diff --git a/src/3rdparty/libmng/ltmain.sh b/src/3rdparty/libmng/ltmain.sh index 0ba6bdfe7..3b0d7b2bf 100644 --- a/src/3rdparty/libmng/ltmain.sh +++ b/src/3rdparty/libmng/ltmain.sh @@ -75,7 +75,7 @@ NL2SP='tr \015\012 \040\040' # NLS nuisances. # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). +# e.g. LANG=C. # We save the old values to restore during execute mode. if test "${LC_ALL+set}" = set; then save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL @@ -2295,23 +2295,6 @@ compiler." versuffix="$major.$age.$revision" ;; - osf) - major=`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - sunos) major=".$current" versuffix=".$current.$revision" @@ -2471,9 +2454,7 @@ compiler." pass_all) # Don't check for shared/static. Everything works. # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behaviour. + # whether the library exists or not. newdeplibs=$deplibs ;; test_compile) diff --git a/src/3rdparty/libpng/README b/src/3rdparty/libpng/README index a939432ae..f1589fa77 100644 --- a/src/3rdparty/libpng/README +++ b/src/3rdparty/libpng/README @@ -216,7 +216,7 @@ Files in this distribution: (gcc, creates libpng12.so.0.1.2.5) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile - makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc + makefile.sco => For Unixware 7 with Native cc makefile.mips => MIPS makefile makefile.acorn => Acorn makefile makefile.amiga => Amiga makefile diff --git a/src/3rdparty/libpng/scripts/makefile.sco b/src/3rdparty/libpng/scripts/makefile.sco index 74068a2cc..2f3b47938 100644 --- a/src/3rdparty/libpng/scripts/makefile.sco +++ b/src/3rdparty/libpng/scripts/makefile.sco @@ -1,4 +1,4 @@ -# makefile for SCO OSr5 ELF and Unixware 7 with Native cc +# makefile for Unixware 7 with Native cc # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx # force ELF build dynamic linking, SONAME setting in lib and RPATH in app # Copyright (C) 2002 Glenn Randers-Pehrson diff --git a/src/3rdparty/zlib/configure b/src/3rdparty/zlib/configure index 6e138594e..0b35bcb71 100755 --- a/src/3rdparty/zlib/configure +++ b/src/3rdparty/zlib/configure @@ -105,20 +105,11 @@ else IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} CFLAGS=${CFLAGS-"-ansi -O2"} LDSHARED=${LDSHARED-"cc -shared"};; - OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"} - CFLAGS=${CFLAGS-"-O -std1"} - LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};; - OSF1*) SFLAGS=${CFLAGS-"-O -std1"} - CFLAGS=${CFLAGS-"-O -std1"} - LDSHARED=${LDSHARED-"cc -shared"};; QNX*) SFLAGS=${CFLAGS-"-4 -O"} CFLAGS=${CFLAGS-"-4 -O"} LDSHARED=${LDSHARED-"cc"} RANLIB=${RANLIB-"true"} AR="cc -A";; - SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} - CFLAGS=${CFLAGS-"-O3"} - LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} CFLAGS=${CFLAGS-"-fast -xcg89"} LDSHARED=${LDSHARED-"cc -G"};; diff --git a/src/codecs/tqtextcodec.cpp b/src/codecs/tqtextcodec.cpp index 6c495df8f..7082c43b0 100644 --- a/src/codecs/tqtextcodec.cpp +++ b/src/codecs/tqtextcodec.cpp @@ -2745,7 +2745,7 @@ static void setupLocaleMapper() localeMapper = TQTextCodec::codecForName( "System" ); #else -#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) && !defined(Q_OS_MAC) +#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_MAC) char *charset = nl_langinfo (CODESET); if ( charset ) localeMapper = TQTextCodec::codecForName( charset ); diff --git a/src/kernel/tqeventloop_glib_p.h b/src/kernel/tqeventloop_glib_p.h index 45c6a1bfc..9fb8ab507 100644 --- a/src/kernel/tqeventloop_glib_p.h +++ b/src/kernel/tqeventloop_glib_p.h @@ -49,11 +49,6 @@ #include "qplatformdefs.h" #endif // QT_H -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #include "tqeventloop.h" #include "tqwindowdefs.h" diff --git a/src/kernel/tqeventloop_p.h b/src/kernel/tqeventloop_p.h index 46e5fae9e..395d90a85 100644 --- a/src/kernel/tqeventloop_p.h +++ b/src/kernel/tqeventloop_p.h @@ -57,11 +57,6 @@ #include "qplatformdefs.h" #endif // QT_H -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #include "tqwindowdefs.h" class TQSocketNotifier; diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp index e53dc5ff6..e5bacff9c 100644 --- a/src/kernel/tqprinter_unix.cpp +++ b/src/kernel/tqprinter_unix.cpp @@ -412,7 +412,6 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) uint i; for (i = 0; i < lphack.size(); ++i) lpargs[i+1] = (char *)lphack[i].ascii(); -#ifndef Q_OS_OSF if (psToStr[page_size]) { lpargs[++i] = (char *)"-o"; lpargs[++i] = (char *)psToStr[page_size]; @@ -421,7 +420,6 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) media += psToStr[page_size]; lpargs[++i] = (char *)media.ascii(); } -#endif lpargs[++i] = 0; char **lprargs = new char *[lprhack.size()+1]; lprargs[0] = (char *)"lpr"; diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp index 27a4ce33c..7b21783b0 100644 --- a/src/kernel/tqstyle.cpp +++ b/src/kernel/tqstyle.cpp @@ -1033,7 +1033,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, \value PE_ScrollBarAddLine scrollbar line increase indicator (i.e. scroll down); see also TQScrollBar. \value PE_ScrollBarSubLine scrollbar line decrease indicator (i.e. scroll up). - \value PE_ScrollBarAddPage scolllbar page increase indicator (i.e. page down). + \value PE_ScrollBarAddPage scrollbar page increase indicator (i.e. page down). \value PE_ScrollBarSubPage scrollbar page decrease indicator (i.e. page up). \value PE_ScrollBarSlider scrollbar slider \value PE_ScrollBarFirst scrollbar first line indicator (i.e. home). @@ -1986,7 +1986,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, value. If TRUE, when clicking a scrollbar SubControl, holding the mouse button down and moving the pointer outside the SubControl, the scrollbar continues to scroll. If FALSE, the - scollbar stops scrolling when the pointer leaves the + scrollbar stops scrolling when the pointer leaves the SubControl. \value SH_TabBar_Alignment the alignment for tabs in a @@ -2063,7 +2063,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, cause a listview expansion to be selected. \value SH_TabBar_PreferNoArrows whether a tabbar should suggest a size - to prevent scoll arrows. + to prevent scroll arrows. \value SH_ComboBox_Popup allows popups as a combobox dropdown menu. diff --git a/src/kernel/tqt_x11_p.h b/src/kernel/tqt_x11_p.h index 5d807238a..05bbf80b5 100644 --- a/src/kernel/tqt_x11_p.h +++ b/src/kernel/tqt_x11_p.h @@ -198,9 +198,6 @@ typedef char *XPointer; #if defined(X11R4) // X11R4 does not have XIM #define TQT_NO_XIM -#elif defined(Q_OS_OSF) && (XlibSpecificationRelease < 6) -// broken in Xlib up to OSF/1 3.2 -#define TQT_NO_XIM #elif defined(Q_OS_AIX) // broken in Xlib up to what version of AIX? #define TQT_NO_XIM @@ -211,9 +208,6 @@ typedef char *XPointer; #elif defined(Q_OS_HPUX) && defined(__LP64__) // XCreateIC broken when compiling 64-bit ELF on HP-UX 11.0 #define TQT_NO_XIM -#elif defined(Q_OS_SCO) -// ### suggested by user... -// ### #define TQT_NO_XIM #endif // TQT_NO_XIM diff --git a/src/tools/tqdatastream.cpp b/src/tools/tqdatastream.cpp index f2980a4e1..dd4114bcb 100644 --- a/src/tools/tqdatastream.cpp +++ b/src/tools/tqdatastream.cpp @@ -503,7 +503,7 @@ static TQ_INT64 read_int_ascii( TQDataStream *s ) } buf[n] = '\0'; -#if defined(__LP64__) || defined(Q_OS_OSF) +#if defined(__LP64__) // sizeof(long) == 8 return strtol(buf, (char **)0, 10); #else diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h index f80109911..b49fdc242 100644 --- a/src/tools/tqglobal.h +++ b/src/tools/tqglobal.h @@ -67,8 +67,6 @@ OPENBSD - OpenBSD BSDI - BSD/OS IRIX - SGI Irix - OSF - HP Tru64 UNIX - SCO - SCO OpenServer 5 UNIXWARE - UnixWare 7, Open UNIX 8 AIX - AIX HURD - GNU Hurd @@ -128,8 +126,6 @@ # define Q_OS_BSD4 #elif defined(__sgi) # define Q_OS_IRIX -#elif defined(__osf__) -# define Q_OS_OSF #elif defined(_AIX) # define Q_OS_AIX #elif defined(__Lynx__) @@ -142,9 +138,7 @@ # define Q_OS_QNX #elif defined(_SEQUENT_) # define Q_OS_DYNIX -#elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */ -# define Q_OS_SCO -#elif defined(__USLC__) /* all SCO platforms + UDK or OUDK */ +#elif defined(__USLC__) /* all UDK or OUDK */ # define Q_OS_UNIXWARE # define Q_OS_UNIXWARE7 #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */ @@ -203,7 +197,7 @@ DEC - DEC C++ HP - HPUX C++ HPACC - HPUX ANSI C++ - USLC - SCO OUDK, UDK, and UnixWare 2.X C++ + USLC - UDK, and UnixWare 2.X C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows HIGHC - MetaWare High C/C++ @@ -339,36 +333,6 @@ # define Q_CANNOT_DELETE_CONSTANT # endif -/* Older versions of DEC C++ do not define __EDG__ or __EDG - observed - on DEC C++ V5.5-004. New versions do define __EDG__ - observed on - Compaq C++ V6.3-002. - This compiler is different enough from other EDG compilers to handle - it separately anyway. */ -#elif defined(__DECCXX) || defined(__DECC) -# define Q_CC_DEC -/* Compaq C++ V6 compilers are EDG-based but I'm not sure about older - DEC C++ V5 compilers. */ -# if defined(__EDG__) -# define Q_CC_EDG -# endif -/* Compaq have disabled EDG's _BOOL macro and use _BOOL_EXISTS instead - - observed on Compaq C++ V6.3-002. - In any case versions prior to Compaq C++ V6.0-005 do not have bool. */ -# if !defined(_BOOL_EXISTS) -# define Q_NO_BOOL_TYPE -# endif -/* Spurious (?) error messages observed on Compaq C++ V6.5-014. */ -# define Q_NO_USING_KEYWORD -/* Apply to all versions prior to Compaq C++ V6.0-000 - observed on - DEC C++ V5.5-004. */ -# if __DECCXX_VER < 60060000 -# define TQ_TYPENAME -# define Q_BROKEN_TEMPLATE_SPECIALIZATION -# define Q_CANNOT_DELETE_CONSTANT -# endif -/* avoid undefined symbol problems with out-of-line template members */ -# define TQ_INLINE_TEMPLATES inline - /* Compilers with EDG front end are similar. To detect them we test: __EDG documented by SGI, observed on MIPSpro 7.3.1.1 and KAI C++ 4.0b __EDG__ documented in EDG online docs, observed on Compaq C++ V6.3-002 */ diff --git a/src/tools/tqlocale.cpp b/src/tools/tqlocale.cpp index 60cfc1bb0..a53d34571 100644 --- a/src/tools/tqlocale.cpp +++ b/src/tools/tqlocale.cpp @@ -70,11 +70,6 @@ # include #endif -#if defined (Q_OS_OSF) && (defined(__DECC) || defined(__DECCXX)) -# define INFINITY DBL_INFINITY -# define NAN DBL_QNAN -#endif - #if (defined(Q_CC_GNU) && defined(Q_OS_WIN)) || __GNUC__ == 4 || defined(QT_QLOCALE_NEEDS_VOLATILE) # define NEEDS_VOLATILE volatile #else diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp index b9c7cb047..e0bb62f1a 100644 --- a/tools/designer/app/main.cpp +++ b/tools/designer/app/main.cpp @@ -33,11 +33,6 @@ #include "qplatformdefs.h" -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #include "mainwindow.h" #include "formwindow.h" @@ -52,11 +47,6 @@ #include #include -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #if defined(TQ_WS_WIN) #include #include diff --git a/tools/designer/tquic/embed.cpp b/tools/designer/tquic/embed.cpp index 422023009..4f8fa48f4 100644 --- a/tools/designer/tquic/embed.cpp +++ b/tools/designer/tquic/embed.cpp @@ -297,7 +297,7 @@ void TQUic::embed( TQTextStream& out, const char* project, const TQStringList& i out << "{\n"; out << "public:\n"; out << " StaticInitImages_" << cProject << "() { qInitImages_" << cProject << "(); }\n"; - out << "#if defined(Q_OS_SCO) || defined(Q_OS_UNIXWARE)\n"; + out << "#if defined(Q_OS_UNIXWARE)\n"; out << " ~StaticInitImages_" << cProject << "() { }\n"; out << "#else\n"; out << " ~StaticInitImages_" << cProject << "() { qCleanupImages_" << cProject << "(); }\n";