summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/html/ntqstyle.html6
-rw-r--r--doc/html/qglobal-h.html40
-rw-r--r--doc/html/qmake-manual-2.html2
-rw-r--r--doc/man/man3/tqstyle.3qt6
4 files changed, 9 insertions, 45 deletions
diff --git a/doc/html/ntqstyle.html b/doc/html/ntqstyle.html
index 54201adbe..98361b36f 100644
--- a/doc/html/ntqstyle.html
+++ b/doc/html/ntqstyle.html
@@ -366,7 +366,7 @@ header
<li><tt>TQStyle::PE_ScrollBarAddLine</tt> - scrollbar line increase indicator
(i.e. scroll down); see also <a href="ntqscrollbar.html">TQScrollBar</a>.
<li><tt>TQStyle::PE_ScrollBarSubLine</tt> - scrollbar line decrease indicator (i.e. scroll up).
-<li><tt>TQStyle::PE_ScrollBarAddPage</tt> - scolllbar page increase indicator (i.e. page down).
+<li><tt>TQStyle::PE_ScrollBarAddPage</tt> - scrollbar page increase indicator (i.e. page down).
<li><tt>TQStyle::PE_ScrollBarSubPage</tt> - scrollbar page decrease indicator (i.e. page up).
<li><tt>TQStyle::PE_ScrollBarSlider</tt> - scrollbar slider
<li><tt>TQStyle::PE_ScrollBarFirst</tt> - scrollbar first line indicator (i.e. home).
@@ -434,7 +434,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.
<li><tt>TQStyle::SH_TabBar_Alignment</tt> - the alignment for tabs in a
<a href="ntqtabwidget.html">TQTabWidget</a>. Possible values are <a href="ntqt.html#AlignmentFlags-enum">TQt::AlignLeft</a>, <a href="ntqt.html#AlignmentFlags-enum">TQt::AlignCenter</a> and <a href="ntqt.html#AlignmentFlags-enum">TQt::AlignRight</a>.
@@ -486,7 +486,7 @@ cause a tab to be selected.
<li><tt>TQStyle::SH_ListViewExpand_SelectMouseType</tt> - which type of mouse event should
cause a listview expansion to be selected.
<li><tt>TQStyle::SH_TabBar_PreferNoArrows</tt> - whether a tabbar should suggest a size
-to prevent scoll arrows.
+to prevent scroll arrows.
<li><tt>TQStyle::SH_ComboBox_Popup</tt> - allows popups as a combobox dropdown
menu.
<li><tt>TQStyle::SH_Workspace_FillSpaceOnMaximize</tt> - the workspace should
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 7042181f1..cfb9da268 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -103,8 +103,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
@@ -162,8 +160,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__)
@@ -176,9 +172,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__) &amp;&amp; defined(i386) /* Open UNIX 8 + GCC */
@@ -237,7 +231,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++
@@ -376,36 +370,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 &lt; 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/qmake-manual-2.html b/doc/html/qmake-manual-2.html
index f1c9c5e2f..0fc29f281 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 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>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++ 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>
diff --git a/doc/man/man3/tqstyle.3qt b/doc/man/man3/tqstyle.3qt
index 1f6790589..b4d153d8e 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
\fCQStyle::PE_ScrollBarSubLine\fR - scrollbar line decrease indicator (i.e. scroll up).
.TP
-\fCQStyle::PE_ScrollBarAddPage\fR - scolllbar page increase indicator (i.e. page down).
+\fCQStyle::PE_ScrollBarAddPage\fR - scrollbar page increase indicator (i.e. page down).
.TP
\fCQStyle::PE_ScrollBarSubPage\fR - scrollbar page decrease indicator (i.e. page up).
.TP
@@ -534,7 +534,7 @@ This enum represents a StyleHint. A StyleHint is a general look and/or feel hint
.TP
\fCQStyle::SH_ScrollBar_LeftClickAbsolutePosition\fR - a boolean value. If TRUE, left clicking on a scrollbar causes the slider to jump to that position. If FALSE, the left clicking will behave as appropriate for each control.
.TP
-\fCQStyle::SH_ScrollBar_ScrollWhenPointerLeavesControl\fR - a boolean 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 SubControl.
+\fCQStyle::SH_ScrollBar_ScrollWhenPointerLeavesControl\fR - a boolean 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 scrollbar stops scrolling when the pointer leaves the SubControl.
.TP
\fCQStyle::SH_TabBar_Alignment\fR - the alignment for tabs in a QTabWidget. Possible values are TQt::AlignLeft, TQt::AlignCenter and TQt::AlignRight.
.TP
@@ -582,7 +582,7 @@ This enum represents a StyleHint. A StyleHint is a general look and/or feel hint
.TP
\fCQStyle::SH_ListViewExpand_SelectMouseType\fR - which type of mouse event should cause a listview expansion to be selected.
.TP
-\fCQStyle::SH_TabBar_PreferNoArrows\fR - whether a tabbar should suggest a size to prevent scoll arrows.
+\fCQStyle::SH_TabBar_PreferNoArrows\fR - whether a tabbar should suggest a size to prevent scroll arrows.
.TP
\fCQStyle::SH_ComboBox_Popup\fR - allows popups as a combobox dropdown menu.
.TP