diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/abouttqt.doc | 2 | ||||
| -rw-r--r-- | doc/faq.doc | 2 | ||||
| -rw-r--r-- | doc/html/abouttqt.html | 2 | ||||
| -rw-r--r-- | doc/html/faq.html | 2 | ||||
| -rw-r--r-- | doc/html/install-x11.html | 2 | ||||
| -rw-r--r-- | doc/html/qmake-manual-2.html | 2 | ||||
| -rw-r--r-- | doc/html/tqglobal-h.html | 18 | ||||
| -rw-r--r-- | doc/installation.doc | 2 |
8 files changed, 7 insertions, 25 deletions
diff --git a/doc/abouttqt.doc b/doc/abouttqt.doc index a78e7e01e..ffe3da477 100644 --- a/doc/abouttqt.doc +++ b/doc/abouttqt.doc @@ -24,7 +24,7 @@ development. Qt is supported on the following platforms: \list \i <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP - \i <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, + \i <b>Unix/X11</b> -- Linux, Sun Solaris, IBM AIX, SGI IRIX and a wide range of others \i <b>Macintosh</b> -- Mac OS X \endlist diff --git a/doc/faq.doc b/doc/faq.doc index b1024ac73..6a0fb03fc 100644 --- a/doc/faq.doc +++ b/doc/faq.doc @@ -24,7 +24,7 @@ Qt is supported on the following platforms: \list \i <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP - \i <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, + \i <b>Unix/X11</b> -- Linux, Sun Solaris, IBM AIX, SGI IRIX and a wide range of others \i <b>Macintosh</b> -- Mac OS X \endlist diff --git a/doc/html/abouttqt.html b/doc/html/abouttqt.html index 2d637e11d..a9f0cdb54 100644 --- a/doc/html/abouttqt.html +++ b/doc/html/abouttqt.html @@ -46,7 +46,7 @@ development. <p> TQt is supported on the following platforms: <ul> <li> <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP -<li> <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, +<li> <b>Unix/X11</b> -- Linux, Sun Solaris, IBM AIX, SGI IRIX and a wide range of others <li> <b>Macintosh</b> -- Mac OS X </ul> diff --git a/doc/html/faq.html b/doc/html/faq.html index 7e530faf7..f248d4000 100644 --- a/doc/html/faq.html +++ b/doc/html/faq.html @@ -161,7 +161,7 @@ extensible, and allows true component programming. <p> TQt is supported on the following platforms: <p> <ul> <li> <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP -<li> <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, +<li> <b>Unix/X11</b> -- Linux, Sun Solaris, IBM AIX, SGI IRIX and a wide range of others <li> <b>Macintosh</b> -- Mac OS X </ul> diff --git a/doc/html/install-x11.html b/doc/html/install-x11.html index 096636dba..2ced953ca 100644 --- a/doc/html/install-x11.html +++ b/doc/html/install-x11.html @@ -82,7 +82,7 @@ following lines: re-source the profile before continuing, so that at least <tt>$TQTDIR</tt> is set. The installation will give an error message and not proceed otherwise. -<p> On AIX set LIBPATH and on HP-UX set SHLIB_PATH instead of LD_LIBRARY_PATH. +<p> On AIX set LIBPATH instead of LD_LIBRARY_PATH. <p> Note that the SGI MIPSpro o32 and Sun WorkShop 5.0 targets are no longer supported as of TQt 3.3. <p> <li> Install your license file as <tt>$HOME/.qt-license</tt>. diff --git a/doc/html/qmake-manual-2.html b/doc/html/qmake-manual-2.html index 42479b9bf..404024f9b 100644 --- a/doc/html/qmake-manual-2.html +++ b/doc/html/qmake-manual-2.html @@ -37,7 +37,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 hurd-g++ linux-kcc tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p> +<p>aix-64 irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ linux-icc qnx-g++ tru64-cxx win32-msvc hurd-g++ linux-kcc tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-visa irix-g++ macx-g++ unixware-g irix-n32 solaris-64 unixware7-cc</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> </ul><p>Once the environment variables are set go into the qmake directory, <em>$TQTDIR/qmake</em>, e.g. <em>C:\qt\qmake</em>. Now run <em>make</em> or <em>nmake</em> depending on your compiler.</p> <p>When the make has completed, <em>qmake</em> is ready for use.</p> diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html index e96c1a4d1..4a37f1803 100644 --- a/doc/html/tqglobal-h.html +++ b/doc/html/tqglobal-h.html @@ -94,7 +94,6 @@ body { background: #ffffff; color: black; } WIN32 - Win32 (Windows 95/98/ME and Windows NT/2000/XP) CYGWIN - Cygwin SOLARIS - Sun Solaris - HPUX - HP-UX ULTRIX - DEC Ultrix LINUX - Linux FREEBSD - FreeBSD @@ -138,8 +137,6 @@ body { background: #ffffff; color: black; } # define Q_OS_WIN32 #elif defined(__sun) || defined(sun) # define Q_OS_SOLARIS -#elif defined(hpux) || defined(__hpux) -# define Q_OS_HPUX #elif defined(__ultrix) || defined(ultrix) # define Q_OS_ULTRIX #elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__) @@ -224,8 +221,6 @@ body { background: #ffffff; color: black; } SUN - Sun WorkShop, Forte Developer, or Sun ONE Studio C++ MIPS - MIPSpro C++ DEC - DEC C++ - HP - HPUX C++ - HPACC - HPUX ANSI C++ USLC - UDK, and UnixWare 2.X C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows @@ -274,10 +269,6 @@ body { background: #ffffff; color: black; } # if __GNUC__ == 2 && __GNUC_MINOR__ <= 95 # define Q_NO_USING_KEYWORD # endif -/* GCC 3.1 and GCC 3.2 wrongly define _SB_CTYPE_MACROS on HP-UX */ -# if defined(Q_OS_HPUX) && __GNUC__ == 3 && __GNUC_MINOR__ >= 1 -# define Q_WRONG_SB_CTYPE_MACROS -# endif /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack TQChars to 16 bits, to avoid @@ -410,15 +401,6 @@ body { background: #ffffff; color: black; } # define Q_NO_USING_KEYWORD # endif -#elif defined(Q_OS_HPUX) -/* __HP_aCC was not defined in first aCC releases */ -# if defined(__HP_aCC) || __cplusplus >= 199707L -# define Q_CC_HPACC -# else -# define Q_CC_HP -# endif -# define Q_NO_USING_KEYWORD /* ### check "using" status */ - #else # error "TQt has not been tested with this compiler - talk to qt-bugs@trolltech.com" #endif diff --git a/doc/installation.doc b/doc/installation.doc index d9291b80f..584b9b777 100644 --- a/doc/installation.doc +++ b/doc/installation.doc @@ -116,7 +116,7 @@ where you choose to install Qt. is set. The installation will give an error message and not proceed otherwise. - On AIX set LIBPATH and on HP-UX set SHLIB_PATH instead of LD_LIBRARY_PATH. + On AIX set LIBPATH instead of LD_LIBRARY_PATH. Note that the SGI MIPSpro o32 and Sun WorkShop 5.0 targets are no longer supported as of TQt 3.3. |