summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qmake/doc/src/qmake-manual.qdoc14
-rw-r--r--src/dbus/doc/src/dbus-adaptors.qdoc3
-rw-r--r--src/gui/doc/src/paintsystem.qdoc3
-rw-r--r--src/gui/doc/src/richtext.qdoc6
-rw-r--r--src/sql/doc/src/sql-programming.qdoc5
-rw-r--r--src/testlib/doc/src/qttestlib-manual.qdoc7
-rw-r--r--src/tools/qlalr/doc/src/qlalr.qdoc6
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/layout.qdoc1
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc6
-rw-r--r--src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc1
-rw-r--r--src/xml/doc/src/xml-processing.qdoc4
11 files changed, 0 insertions, 56 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index 351009bd1c..f1e03eb407 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -84,7 +84,6 @@
/*!
\page qmake-overview.html
\title Overview
- \contentspage {qmake Manual}{Contents}
\previouspage qmake Manual
\nextpage Getting Started
@@ -158,7 +157,6 @@
/*!
\page qmake-project-files.html
\title Creating Project Files
- \contentspage {qmake Manual}{Contents}
\previouspage Getting Started
\nextpage Building Common Project Types
@@ -477,7 +475,6 @@
/*!
\page qmake-running.html
\title Running qmake
- \contentspage {qmake Manual}{Contents}
\previouspage Building Common Project Types
\nextpage Platform Notes
@@ -647,7 +644,6 @@
/*!
\page qmake-platform-notes.html
\title Platform Notes
- \contentspage {qmake Manual}{Contents}
\previouspage Running qmake
\nextpage qmake Language
@@ -863,7 +859,6 @@
/*!
\page qmake-reference.html
\title Reference
- \contentspage {qmake Manual}{Contents}
\previouspage Configuring qmake
\nextpage Variables
@@ -894,7 +889,6 @@
/*!
\page qmake-variable-reference.html
\title Variables
- \contentspage {qmake Manual}{Contents}
\previouspage Reference
\nextpage Replace Functions
\keyword qmake Variable Reference
@@ -3189,7 +3183,6 @@
/*!
\page qmake-function-reference.html
\title Replace Functions
- \contentspage {qmake Manual}{Contents}
\previouspage Variables
\nextpage Test Functions
\keyword qmake Function Reference - Replace Functions
@@ -3723,7 +3716,6 @@
/*!
\page qmake-test-function-reference.html
\title Test Functions
- \contentspage {qmake Manual}{Contents}
\previouspage Replace Functions
\keyword qmake Function Reference - Test Functions
@@ -4145,7 +4137,6 @@
/*!
\page qmake-environment-reference.html
- \contentspage {qmake Manual}{Contents}
\previouspage Using Precompiled Headers
\nextpage Reference
@@ -4297,7 +4288,6 @@
/*!
\page qmake-language.html
\title qmake Language
- \contentspage {qmake Manual}{Contents}
\previouspage Platform Notes
\nextpage Advanced Usage
@@ -4624,7 +4614,6 @@
/*!
\page qmake-advanced-usage.html
\title Advanced Usage
- \contentspage {qmake Manual}{Contents}
\previouspage qmake Language
\nextpage Using Precompiled Headers
@@ -4973,7 +4962,6 @@
/*!
\page qmake-precompiledheaders.html
\title Using Precompiled Headers
- \contentspage {qmake Manual}{Contents}
\previouspage Advanced Usage
\nextpage Configuring qmake
@@ -5191,7 +5179,6 @@
\keyword qmake-getting-started
\page qmake-tutorial.html
\title Getting Started
- \contentspage {qmake Manual}{Contents}
\previouspage Overview
\nextpage Creating Project Files
@@ -5360,7 +5347,6 @@
/*!
\page qmake-common-projects.html
\title Building Common Project Types
- \contentspage {qmake Manual}{Contents}
\previouspage Creating Project Files
\nextpage Running qmake
diff --git a/src/dbus/doc/src/dbus-adaptors.qdoc b/src/dbus/doc/src/dbus-adaptors.qdoc
index 9ebf0cedf2..496e36ea92 100644
--- a/src/dbus/doc/src/dbus-adaptors.qdoc
+++ b/src/dbus/doc/src/dbus-adaptors.qdoc
@@ -79,7 +79,6 @@
\page qdbusdeclaringslots.html
\title Declaring Slots in D-Bus Adaptors
- \contentspage Using Qt D-Bus Adaptors
\nextpage Declaring Signals in D-Bus Adaptors
Slots in D-Bus adaptors are declared just like normal, public slots, but their
@@ -211,7 +210,6 @@
\title Declaring Signals in D-Bus Adaptors
\previouspage Declaring Slots in D-Bus Adaptors
- \contentspage Using Qt D-Bus Adaptors
\nextpage The Qt D-Bus Type System
Any signal in a class derived from QDBusAbstractAdaptor will be automatically
@@ -240,7 +238,6 @@
\title The Qt D-Bus Type System
\previouspage Declaring Signals in D-Bus Adaptors
- \contentspage Using Qt D-Bus Adaptors
D-Bus has an extensible type system based on a few primitives and
composition of the primitives in arrays and structures. Qt D-Bus
diff --git a/src/gui/doc/src/paintsystem.qdoc b/src/gui/doc/src/paintsystem.qdoc
index 98d71e9e55..163c0252da 100644
--- a/src/gui/doc/src/paintsystem.qdoc
+++ b/src/gui/doc/src/paintsystem.qdoc
@@ -93,7 +93,6 @@
\page paintsystem-devices.html
\title Paint Devices and Backends
- \contentspage The Paint System
\nextpage Drawing and Filling
\section1 Creating a Paint Device
@@ -185,7 +184,6 @@
\title Drawing and Filling
\previouspage Paint Devices and Backends
- \contentspage The Paint System
\nextpage Coordinate System
\section1 Drawing
@@ -303,7 +301,6 @@
\title Reading and Writing Image Files
\previouspage Coordinate System
- \contentspage The Paint System
The most common way to read images is through QImage and QPixmap's
constructors, or by calling the QImage::load() and QPixmap::load()
diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc
index 31a2ebf05b..b7c731cf43 100644
--- a/src/gui/doc/src/richtext.qdoc
+++ b/src/gui/doc/src/richtext.qdoc
@@ -83,7 +83,6 @@
/*!
\page richtext-structure.html
- \contentspage richtext.html Contents
\previouspage Rich Text Processing
\nextpage The QTextCursor Interface
@@ -349,7 +348,6 @@
/*!
\page richtext-cursor.html
- \contentspage richtext.html Contents
\previouspage Rich Text Document Structure
\nextpage Document Layouts
@@ -656,7 +654,6 @@
/*!
\page richtext-layouts.html
- \contentspage richtext.html Contents
\previouspage The QTextCursor Interface
\nextpage Common Rich Text Editing Tasks
@@ -707,7 +704,6 @@
/*!
\page richtext-common-tasks.html
- \contentspage richtext.html Contents
\previouspage Document Layouts
\nextpage Advanced Rich Text Processing
@@ -800,7 +796,6 @@
/*!
\page richtext-advanced-processing.html
- \contentspage richtext.html Contents
\previouspage Common Rich Text Editing Tasks
\nextpage Supported HTML Subset
@@ -849,7 +844,6 @@
\title Supported HTML Subset
\brief Describes the support for HTML markup in text widgets.
- \contentspage richtext.html Contents
\previouspage Common Rich Text Editing Tasks
Qt's text widgets are able to display rich text, specified using a subset of \l {http://www.w3.org/TR/html401/}{HTML 4}
diff --git a/src/sql/doc/src/sql-programming.qdoc b/src/sql/doc/src/sql-programming.qdoc
index ece89a30ab..f20b1292fc 100644
--- a/src/sql/doc/src/sql-programming.qdoc
+++ b/src/sql/doc/src/sql-programming.qdoc
@@ -105,7 +105,6 @@
\page sql-connecting.html
\title Connecting to Databases
- \contentspage SQL Programming
\previouspage SQL Programming
\nextpage Executing SQL Statements
@@ -175,7 +174,6 @@
\title Executing SQL Statements
\previouspage Connecting to Databases
- \contentspage SQL Programming
\nextpage Using the SQL Model Classes
@@ -325,7 +323,6 @@
\title Using the SQL Model Classes
\previouspage Executing SQL Statements
- \contentspage SQL Programming
\nextpage Presenting Data in a Table View
In addition to QSqlQuery, Qt offers three higher-level classes
@@ -471,7 +468,6 @@
\title Presenting Data in a Table View
\previouspage Using the SQL Model Classes
- \contentspage SQL Programming
\nextpage Creating Data-Aware Forms
The QSqlQueryModel, QSqlTableModel, and QSqlRelationalTableModel
@@ -575,7 +571,6 @@
\title Creating Data-Aware Forms
\previouspage Presenting Data in a Table View
- \contentspage SQL Programming
Using the SQL models described above, the contents of a database can
be presented to other model/view components. For some applications,
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc
index 3acc08d8f4..56903d44bf 100644
--- a/src/testlib/doc/src/qttestlib-manual.qdoc
+++ b/src/testlib/doc/src/qttestlib-manual.qdoc
@@ -481,7 +481,6 @@
/*!
\page qtest-tutorial.html
\brief A short introduction to testing with Qt Test.
- \contentspage Qt Test Overview
\nextpage {Chapter 1: Writing a Unit Test}{Chapter 1}
\ingroup best-practices
@@ -506,7 +505,6 @@
/*!
\example tutorial1
- \contentspage {Qt Test Tutorial}{Contents}
\nextpage {Chapter 2: Data Driven Testing}{Chapter 2}
\title Chapter 1: Writing a Unit Test
@@ -582,7 +580,6 @@
\example tutorial2
\previouspage {Chapter 1: Writing a Unit Test}{Chapter 1}
- \contentspage {Qt Test Tutorial}{Contents}
\nextpage {Chapter 3: Simulating Gui Events}{Chapter 3}
\title Chapter 2: Data Driven Testing
@@ -691,7 +688,6 @@
\example tutorial3
\previouspage {Chapter 2: Data Driven Testing}{Chapter 2}
- \contentspage {Qt Test Tutorial}{Contents}
\nextpage {Chapter 4: Replaying GUI Events}{Chapter 4}
\title Chapter 3: Simulating GUI Events
@@ -752,7 +748,6 @@
\example tutorial4
\previouspage {Chapter 3: Simulating GUI Events}{Chapter 3}
- \contentspage {Qt Test Tutorial}{Contents}
\nextpage {Chapter 5: Writing a Benchmark}{Chapter 5}
\title Chapter 4: Replaying GUI Events
@@ -833,7 +828,6 @@
\example tutorial5
\previouspage {Chapter 4: Replaying GUI Events}{Chapter 4}
- \contentspage {Qt Test Tutorial}{Contents}
\nextpage {Chapter 6: Skipping Tests with QSKIP}{Chapter 6}
\title Chapter 5: Writing a Benchmark
@@ -889,7 +883,6 @@
\page qttestlib-tutorial6.html
\previouspage {Chapter 5: Writing a Benchmark}{Chapter 5}
- \contentspage {Qt Test Tutorial}{Contents}
\title Chapter 6: Skipping Tests with QSKIP
\brief How to skip tests in certain cases.
diff --git a/src/tools/qlalr/doc/src/qlalr.qdoc b/src/tools/qlalr/doc/src/qlalr.qdoc
index 74eed82e89..bed6268071 100644
--- a/src/tools/qlalr/doc/src/qlalr.qdoc
+++ b/src/tools/qlalr/doc/src/qlalr.qdoc
@@ -53,7 +53,6 @@
\page qlalr-files.html
\title qlalr - Writing Grammars
- \contentspage qlalr
\previouspage qlalr
\nextpage qlalr - Generating Code from Grammar Specifications
@@ -63,7 +62,6 @@
\page qlalr-generating.html
\title qlalr - Generating Code from Grammar Specifications
- \contentspage qlalr
\previouspage qlalr - Writing Grammars
\nextpage qlalr - qlalr Grammar Specification
*/
@@ -72,7 +70,6 @@
\page qlalr-grammar-specification.html
\title qlalr - qlalr Grammar Specification
- \contentspage qlalr
\previouspage qlalr - Generating Code from Grammar Specifications
\nextpage qlalr - Handling Conflicts
@@ -82,7 +79,6 @@
\page qlalr-handling-conflicts.html
\title qlalr - Handling Conflicts
- \contentspage qlalr
\previouspage qlalr - qlalr Grammar Specification
\nextpage qlalr - Error Handling and Recovery
*/
@@ -91,7 +87,6 @@
\page qlalr-handling-errors.html
\title qlalr - Error Handling and Recovery
- \contentspage qlalr
\previouspage qlalr - Handling Conflicts
\nextpage qlalr - References to External Information
*/
@@ -100,7 +95,6 @@
\page qlalr-external-references.html
\title qlalr - References to External Information
- \contentspage qlalr
\previouspage qlalr - Error Handling and Recovery
*/
diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
index e42e6d42ec..24f8cd836f 100644
--- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
@@ -33,7 +33,6 @@
layouts.
\previouspage Qt Widgets
- \contentspage Qt Widgets
\nextpage {Styles and Style Aware Widgets}{Styles}
\ingroup frameworks-technologies
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index 50f626e7a6..be0a23f79c 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -35,7 +35,6 @@
\ingroup qt-gui-concepts
\previouspage {Styles and Style Aware Widgets}{Styles}
- \contentspage Widgets and Layouts
\nextpage The Style Sheet Syntax
\keyword style sheet
@@ -139,7 +138,6 @@
/*!
\page stylesheet-syntax.html
- \contentspage {Qt Style Sheets}{Contents}
\previouspage Qt Style Sheets
\nextpage Qt Designer Integration
\title The Style Sheet Syntax
@@ -562,7 +560,6 @@
/*!
\page stylesheet-designer.html
- \contentspage {Qt Style Sheets}{Contents}
\previouspage The Style Sheet Syntax
\nextpage Customizing Qt Widgets Using Style Sheets
\title Qt Designer Integration
@@ -588,7 +585,6 @@
/*!
\page stylesheet-customizing.html
- \contentspage {Qt Style Sheets}{Contents}
\previouspage Qt Designer Integration
\nextpage Qt Style Sheets Reference
\title Customizing Qt Widgets Using Style Sheets
@@ -692,7 +688,6 @@
/*!
\page stylesheet-reference.html
- \contentspage {Qt Style Sheets}{Contents}
\previouspage Customizing Qt Widgets Using Style Sheets
\nextpage Qt Style Sheets Examples
\title Qt Style Sheets Reference
@@ -3506,7 +3501,6 @@
/*!
\page stylesheet-examples.html
- \contentspage {Qt Style Sheets}{Contents}
\previouspage Qt Style Sheets Reference
\title Qt Style Sheets Examples
diff --git a/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc b/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc
index 81bc6dd279..5b1ce435d8 100644
--- a/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc
+++ b/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc
@@ -39,7 +39,6 @@
\brief An overview over dialog windows.
\previouspage Application Main Window
- \contentspage Application Windows and Dialogs
\nextpage Desktop Integration
Dialogs can be \e{modal}, in which case the user is required to provide
diff --git a/src/xml/doc/src/xml-processing.qdoc b/src/xml/doc/src/xml-processing.qdoc
index 4dfcbf4722..8ac279f8b6 100644
--- a/src/xml/doc/src/xml-processing.qdoc
+++ b/src/xml/doc/src/xml-processing.qdoc
@@ -72,7 +72,6 @@
\title An Introduction to Namespaces
\target namespaces
- \contentspage XML Processing
\nextpage XML Streaming
Parts of the Qt XML module documentation assume that you are familiar
@@ -211,7 +210,6 @@
\title XML Streaming
\previouspage An Introduction to Namespaces
- \contentspage XML Processing
\nextpage The SAX Interface
Since version 4.3, Qt provides two new classes for reading and
@@ -290,7 +288,6 @@
\title The SAX interface
\previouspage XML Streaming
- \contentspage XML Processing
\nextpage Working with the DOM Tree
SAX is an event-based standard interface for XML parsers.
@@ -520,7 +517,6 @@
\target dom
\previouspage The SAX Interface
- \contentspage XML Processing
DOM Level 2 is a W3C Recommendation for XML interfaces that maps the
constituents of an XML document to a tree structure. The specification