diff options
Diffstat (limited to 'doc/html')
| -rw-r--r-- | doc/html/qglobal-h.html | 23 | ||||
| -rw-r--r-- | doc/html/qmake-manual-2.html | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 93f289138..7042181f1 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -109,7 +109,6 @@ body { background: #ffffff; color: black; } AIX - AIX HURD - GNU Hurd DGUX - DG/UX - RELIANT - Reliant UNIX DYNIX - DYNIX/ptx TQNX - TQNX TQNX6 - TQNX RTP 6.1 @@ -147,8 +146,6 @@ body { background: #ffffff; color: black; } # define Q_OS_HPUX #elif defined(__ultrix) || defined(ultrix) # define Q_OS_ULTRIX -#elif defined(sinix) -# define Q_OS_RELIANT #elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__) # define Q_OS_LINUX #elif defined(__FreeBSD__) || defined(__DragonFly__) @@ -241,7 +238,6 @@ body { background: #ffffff; color: black; } HP - HPUX C++ HPACC - HPUX ANSI C++ USLC - SCO OUDK, UDK, and UnixWare 2.X C++ - CDS - Reliant C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows HIGHC - MetaWare High C/C++ @@ -474,15 +470,6 @@ body { background: #ffffff; color: black; } # define Q_CC_OC # define Q_NO_USING_KEYWORD -/* CDS++ defines __EDG__ although this is not documented in the Reliant - documentation. It also follows conventions like _BOOL and this documented */ -# elif defined(sinix) -# define Q_CC_CDS -# define Q_NO_USING_KEYWORD -# if defined(__cplusplus) && (__cplusplus < 2) /* Cfront C++ mode */ -# define Q_NO_EXCEPTIONS -# endif - /* The MIPSpro compiler in o32 mode is based on EDG but disables features such as template specialization nevertheless */ # elif defined(__sgi) @@ -536,16 +523,6 @@ body { background: #ffffff; color: black; } # define Q_NO_USING_KEYWORD # endif -/* CDS++ does not seem to define __EDG__ or __EDG according to Reliant - documentation but nevertheless uses EDG conventions like _BOOL */ -#elif defined(sinix) -# define Q_CC_EDG -# define Q_CC_CDS -# if !defined(_BOOL) -# define Q_NO_BOOL_TYPE -# endif -# define Q_BROKEN_TEMPLATE_SPECIALIZATION - #elif defined(Q_OS_HPUX) /* __HP_aCC was not defined in first aCC releases */ # if defined(__HP_aCC) || __cplusplus >= 199707L diff --git a/doc/html/qmake-manual-2.html b/doc/html/qmake-manual-2.html index a9158c45f..f1c9c5e2f 100644 --- a/doc/html/qmake-manual-2.html +++ b/doc/html/qmake-manual-2.html @@ -38,7 +38,7 @@ body { background: #ffffff; color: black; } <p>Before building TQt manually the following environment variables must be set:</p> <ul><li><p>QMAKESPEC <br> This must be set to the platform and compiler combination that you are using on your system. <br> For example, if you are using Windows and Microsoft Visual Studio, you would set this environment variable to <em>win32-msvc</em>. If you are using Solaris and g++, you would set this environment variable to <em>solaris-g++</em>.</p> <p>The following is a list of environment variables available to choose from when setting QMAKESPEC:</p> -<p>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 reliant-64 tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder reliant-cds ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ sco-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p> +<p>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</p> <p>The environment variable should be set to qws/envvar where envvar is one of the following:</p> <p>linux-arm-g++ linux-generic-g++ linux-mips-g++ linux-x86-g++ linux-freebsd-g++ linux-ipaq-g++ linux-solaris-g++ qnx-rtp-g++</p> <li><p>TQTDIR <br> This must be set to where TQt is (or will be) installed. For example, <em>c:\qt</em> and <em>\local\qt</em></p> |