summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/README109
-rw-r--r--doc/global/externalsites/external-resources.qdoc2
-rw-r--r--doc/global/qt-html-templates-offline.qdocconf20
-rw-r--r--doc/global/qt-html-templates-online.qdocconf32
-rw-r--r--doc/global/qt-module-defaults.qdocconf3
-rw-r--r--[-rwxr-xr-x]doc/global/template/images/btn_next.pngbin689 -> 695 bytes
-rw-r--r--doc/global/template/images/btn_next_green.pngbin695 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]doc/global/template/images/btn_prev.pngbin676 -> 687 bytes
-rw-r--r--doc/global/template/images/btn_prev_green.pngbin687 -> 0 bytes
-rwxr-xr-xdoc/global/template/images/ico_out.pngbin362 -> 388 bytes
-rw-r--r--doc/global/template/style/offline.css85
-rw-r--r--doc/global/template/style/online.css7
-rw-r--r--doc/src/examples/arrowpad.qdoc223
-rw-r--r--doc/src/examples/hellotr.qdoc174
-rw-r--r--doc/src/examples/multipleinheritance.qdoc94
-rw-r--r--doc/src/examples/trollprint.qdoc261
-rw-r--r--doc/src/images/linguist-arrowpad_en.pngbin1429 -> 0 bytes
-rw-r--r--doc/src/images/linguist-arrowpad_fr.pngbin1671 -> 0 bytes
-rw-r--r--doc/src/images/linguist-arrowpad_nl.pngbin1706 -> 0 bytes
-rw-r--r--doc/src/images/linguist-hellotr_en.pngbin3367 -> 0 bytes
-rw-r--r--doc/src/images/linguist-hellotr_la.pngbin753 -> 0 bytes
-rw-r--r--doc/src/images/linguist-trollprint_10_en.pngbin1951 -> 0 bytes
-rw-r--r--doc/src/images/linguist-trollprint_10_pt_bad.pngbin2073 -> 0 bytes
-rw-r--r--doc/src/images/linguist-trollprint_10_pt_good.pngbin2120 -> 0 bytes
-rw-r--r--doc/src/images/linguist-trollprint_11_en.pngbin2019 -> 0 bytes
-rw-r--r--doc/src/images/linguist-trollprint_11_pt.pngbin2152 -> 0 bytes
-rw-r--r--doc/src/images/openglwindow-example.pngbin19920 -> 0 bytes
-rw-r--r--doc/src/snippets/code/doc_src_examples_arrowpad.cpp43
-rw-r--r--doc/src/snippets/code/doc_src_examples_arrowpad.qdoc54
-rw-r--r--doc/src/snippets/code/doc_src_examples_hellotr.qdoc71
-rw-r--r--doc/src/snippets/code/doc_src_examples_textfinder.pro6
-rw-r--r--doc/src/snippets/code/doc_src_examples_trollprint.cpp77
32 files changed, 156 insertions, 1105 deletions
diff --git a/doc/README b/doc/README
new file mode 100644
index 0000000000..355f61d353
--- /dev/null
+++ b/doc/README
@@ -0,0 +1,109 @@
+Qt 5 Documentation
+==================
+
+New in Qt 5.0, each module has its own documentation package. The documentation
+resides in the module sources as well as the configuration files needed to build
+the module documentation. The main Qt 5.0 Reference Documentation resides in the
+qtdoc repository.
+
+There are two ways to build Qt documentation:
+* run "make docs" in qt5/ or in the repositories
+* run the QDoc tool for each module
+
+
+Running "make docs"
+===================
+
+To build the documentation using Makefiles, qtbase needs to be compiled and
+installed.
+
+Running qmake will create make targets to build the documentation:
+* html_docs - builds only the HTML documentation
+* qch_docs - packages the HTML documentation into QCH files for Qt Creator and
+ Qt Assistant.
+* docs - runs html_docs and qch_docs
+
+Note: qch_docs needs qhelpgenerator to package the documentation. qhelpgenerator
+is in the qttools repository.
+
+These make targets use qmake's QT_INSTALL_DOCS variable as the output directory.
+Running "qmake -query" will list the directory set to QT_INSTALL_DOCS.
+
+To create all of the modules' documentation, run "make docs" in the
+qt5 directory:
+ $> make docs # builds the bundled modules' documentation
+
+It is also possible to build only a small subset of the documentation by using
+make:
+ $> cd qtbase
+ $> make docs # builds the documentation for modules in qtbase
+
+ $> cd qtbase/src/sql
+ $> make docs # builds only the Qt SQL documentation
+
+
+Running QDoc
+============
+
+QDoc is the tool for generating Qt documentation and is located in qtbase.
+The simplest way to compile QDoc is to compile qtbase or only the tools in
+qtbase.
+
+ $> cd qtbase/src
+ $> make sub-tools # compiles QDoc
+
+Each module has a QDoc configuration file (.qdocconf). To build a module's
+documentation, run the "qdoc" binary and pass the qdocconf file as a parameter.
+A mandatory "outputdir" must be specified.
+
+ $> qdoc doc/config/qtdoc.qdocconf -outputdir html
+
+ Note that QDoc will delete the contents of the "html" output directory.
+
+Packaging the Documentation
+===========================
+
+To package the documentation, the HTML files must be compiled
+into a QCH file (.qch).
+
+Required binaries:
+ * assistant - found in qttools
+ * qhelpgenerator - found in qttools
+
+To compile the qch file for each module, first enter the output directory that
+contains the .qhp file and generate the QCH file.
+
+ $> cd qtbase/doc/qtdoc #the default path for QT_INSTALL_DOCS for qtdoc
+ $> qhelpgenerator qtdoc.qhp #creates the QCH file called qtdoc.qch
+
+The QCH file can then be loaded in Qt Assistant or Qt Creator. For Qt Assistant,
+the QCH file can be registered to automatically load it.
+
+ $> assistant -register qtdoc.qch #to automatically load the documentation
+
+
+Global Files
+============
+
+The qtbase/doc/global directory contains various files used by the modules to
+build the documentation. These include macros, stylesheets, and images for
+displaying documentation.
+
+To include these files in a qdocconf, add the following to a qdocconf file:
+
+ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+
+Documentation Structure
+=======================
+For a typical module, the documentation will reside in the source directory.
+The examples and the example documentation are in the "examples" directory.
+
+ qtbase/src/sql/doc/src #Qt SQL's documentation
+ qtbase/examples/sql #Qt SQL's examples
+
+More Information
+================
+
+For more information about Qt 5's documentation, refer to the Qt Project wiki:
+http://qt-project.org/wiki/Qt5DocumentationProject
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index 61f9c01bdb..39e72204d6 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -464,7 +464,7 @@
*/
/*!
- \externalpage ftp://ftp.qt.nokia.com/pub/qt/solutions/lgpl/qtmotifextension-2.7_1-opensource.tar.gz
+ \externalpage ftp://ftp.qt-project.org/pub/qt/solutions/lgpl/qtmotifextension-2.7_1-opensource.tar.gz
\title Motif Extension
*/
diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index abe7e5e349..5f989d2fa8 100644
--- a/doc/global/qt-html-templates-offline.qdocconf
+++ b/doc/global/qt-html-templates-offline.qdocconf
@@ -1,6 +1,26 @@
HTML.nobreadcrumbs = "true"
HTML.stylesheets = template/style/offline.css
+HTML.extraimages += template/images/ico_out.png \
+ template/images/ico_note.png \
+ template/images/ico_note_attention.png \
+ template/images/btn_prev.png \
+ template/images/btn_next.png \
+ template/images/bullet_dn.png \
+ template/images/bullet_sq.png \
+ template/images/bgrContent.png
+
+#specify which files in the output directory should be packed into the qch file.
+qhp.extraFiles += style/offline.css \
+ images/ico_out.png \
+ images/ico_note.png \
+ images/ico_note_attention.png \
+ images/btn_prev.png \
+ images/btn_next.png \
+ images/bullet_dn.png \
+ images/bullet_sq.png \
+ images/bgrContent.png
+
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf
index d6c6b00e99..040a5483c2 100644
--- a/doc/global/qt-html-templates-online.qdocconf
+++ b/doc/global/qt-html-templates-online.qdocconf
@@ -1,36 +1,14 @@
HTML.nobreadcrumbs = "true"
HTML.stylesheets = template/style/online.css
-HTML.extraimages = template/images/btn_next_green.png \
- template/images/box_bg.png \
- template/images/page.png \
- template/images/arrow_down.png \
- template/images/btn_prev.png \
- template/images/blu_dot.png \
+HTML.extraimages += template/images/ico_out.png \
+ template/images/ico_note.png \
template/images/ico_note_attention.png \
- template/images/btn_prev_green.png \
- template/images/bg_ll_blank.png \
+ template/images/btn_prev.png \
template/images/btn_next.png \
- template/images/bg_l_blank.png \
- template/images/ico_note.png \
- template/images/home.png \
- template/images/ico_out.png \
- template/images/header_bg.png \
- template/images/page_bg.png \
- template/images/bg_l.png \
- template/images/bg_r.png \
- template/images/breadcrumb.png \
template/images/bullet_dn.png \
- template/images/feedbackground.png \
- template/images/bullet_gt.png \
- template/images/arrow.png \
template/images/bullet_sq.png \
- template/images/bullet_up.png \
- template/images/sprites-combined.png \
- template/images/horBar.png \
- template/images/bg_ul_blank.png \
- template/images/bgrContent.png \
-
+ template/images/bgrContent.png
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/online.css\" />\n"
@@ -38,7 +16,7 @@ HTML.headerstyles = \
HTML.endheader = \
"</head>\n" \
"<body>\n" \
- "<div class=\"header\" id=\"qtdocheader\"></div>\n"
+ "<div class=\"header\" id=\"qtdocheader\"></div>\n" \
" <header>\n" \
" <div class=\"nav\">\n" \
" <a href=\"http://qt-project.org/\">Qt Home</a>\n" \
diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf
index 7d0705c475..8c8df29437 100644
--- a/doc/global/qt-module-defaults.qdocconf
+++ b/doc/global/qt-module-defaults.qdocconf
@@ -25,8 +25,5 @@ versionsym = QT_VERSION_STR
macro.raisedaster.HTML = "<sup>*</sup>"
-#for including files into the qch file
-qhp.extraFiles += style/offline.css
-
#include the external websites
sourcedirs += externalsites
diff --git a/doc/global/template/images/btn_next.png b/doc/global/template/images/btn_next.png
index f7bc2b7170..c649f18572 100755..100644
--- a/doc/global/template/images/btn_next.png
+++ b/doc/global/template/images/btn_next.png
Binary files differ
diff --git a/doc/global/template/images/btn_next_green.png b/doc/global/template/images/btn_next_green.png
deleted file mode 100644
index c649f18572..0000000000
--- a/doc/global/template/images/btn_next_green.png
+++ /dev/null
Binary files differ
diff --git a/doc/global/template/images/btn_prev.png b/doc/global/template/images/btn_prev.png
index 10a620c518..d1d29895b2 100755..100644
--- a/doc/global/template/images/btn_prev.png
+++ b/doc/global/template/images/btn_prev.png
Binary files differ
diff --git a/doc/global/template/images/btn_prev_green.png b/doc/global/template/images/btn_prev_green.png
deleted file mode 100644
index d1d29895b2..0000000000
--- a/doc/global/template/images/btn_prev_green.png
+++ /dev/null
Binary files differ
diff --git a/doc/global/template/images/ico_out.png b/doc/global/template/images/ico_out.png
index ff6e458fb1..790a05e51d 100755
--- a/doc/global/template/images/ico_out.png
+++ b/doc/global/template/images/ico_out.png
Binary files differ
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index 748effcee4..8b8a7d9ae1 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -8,6 +8,9 @@ margin-left:5px;
margin-right:5px;
}
+p {
+line-height: 20px;
+}
img{
-moz-box-shadow: 3px 3px 3px #ccc;
-webkit-box-shadow: 3px 3px 3px #ccc;
@@ -63,6 +66,16 @@ color: #44a51c;
text-align:left;
}
+a[href*="http://"], a[href*="ftp://"],a[href*="https://"]
+{
+text-decoration: none;
+background-image:url(../images/ico_out.png);
+background-repeat:no-repeat;
+background-position:left;
+padding-left:20px;
+text-align:left;
+}
+
.flags{
text-decoration:none;
text-height:24px;
@@ -155,71 +168,6 @@ height:20px;
margin-left:30px;
}
-.breadcrumb{
-display: block;
-position: relative;
-top:-20px;
-/*border-top:2px solid #ffffff;*/
-border-bottom: 1px solid #cecece;
-background-color:#F2F2F2;
-z-index:1;
-height:20px;
-padding:0px;
-margin:0px;
-padding-left:10px;
-padding-top:2px;
-margin-left:-5px;
-margin-right:-5px;
-}
-
-.breadcrumb ul{
- margin:0px;
- padding:0px;
-}
-
-.breadcrumb ul li{
-background-color:#F2F2F2;
-list-style-type:none;
-padding:0;
-margin:0;
-height:20px;
-}
-
-.breadcrumb li{
-float:left;
-}
-
-.breadcrumb .first {
-background:url(../images/home.png);
-background-position:left;
-background-repeat:no-repeat;
-padding-left:20px;
-}
-
-
-.breadcrumb li a{
-color:#2C418D;
-display:block;
-text-decoration:none;
-background:url(../images/arrow.png);
-background-repeat:no-repeat;
-background-position:right;
-padding-right:25px;
-padding-left:10px;
-}
-
-.breadcrumb li a:hover{
-color:#909090;
-display:block;
-text-decoration:none;
-background:url(../images/arrow.png);
-background-repeat:no-repeat;
-background-position:right;
-padding-right:20px;
-padding-left:10px;
-}
-
-
/* table of content
no display
*/
@@ -483,7 +431,7 @@ margin: 10;
overflow: hidden;
overflow-x: hidden;
overflow-y: hidden;
-padding: 20px 0 20px 0;
+padding: 20px 20px 20px 20px;
}
.qmldefault{
@@ -566,8 +514,7 @@ padding-right:5px;
.toc ul li{
margin-left:15px;
-list-style-image:url(../images/blu_dot.png);
-list-style:outside;
+list-style-image:url(../images/bullet_dn.png);
marker-offset: 0px;
margin-bottom:8px;
padding-left:0px;
@@ -643,7 +590,7 @@ margin-bottom: 20px;
.indexboxcont .sectionlist ul li
{
-line-height: 12px;
+line-height: 1.5;
}
.content .indexboxcont li
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index 21e371b132..f933bac5eb 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -8,6 +8,9 @@ margin-right:5px;
background: none repeat scroll 0% 0% rgb(230,231,232);
}
+p {
+line-height: 20px;
+}
img{
-moz-box-shadow: 3px 3px 3px #ccc;
-webkit-box-shadow: 3px 3px 3px #ccc;
@@ -540,7 +543,7 @@ margin: 10;
overflow: hidden;
overflow-x: hidden;
overflow-y: hidden;
-padding: 20px 0 20px 0;
+padding: 20px 20px 20px 20px;
}
.qmldefault{
@@ -701,7 +704,7 @@ margin-bottom: 20px;
.indexboxcont .sectionlist ul li
{
-line-height: 12px;
+line-height: 1.5;
}
.content .indexboxcont li
diff --git a/doc/src/examples/arrowpad.qdoc b/doc/src/examples/arrowpad.qdoc
deleted file mode 100644
index 39c0558117..0000000000
--- a/doc/src/examples/arrowpad.qdoc
+++ /dev/null
@@ -1,223 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \example linguist/arrowpad
- \title Arrow Pad Example
-
- This example is a slightly more involved and introduces a key \e
- {Qt Linguist} concept: "contexts". It also shows how to use two
- or more languages.
-
- \image linguist-arrowpad_en.png
-
- We will use two translations, French and Dutch, although there is no
- effective limit on the number of possible translations that can be used
- with an application. The relevant lines of \c arrowpad.pro are
-
- \snippet examples/linguist/arrowpad/arrowpad.pro 0
- \codeline
- \snippet examples/linguist/arrowpad/arrowpad.pro 1
-
- Run \c lupdate; it should produce two identical message files
- \c arrowpad_fr.ts and \c arrowpad_nl.ts. These files will contain all the source
- texts marked for translation with \c tr() calls and their contexts.
-
- See the \l{Qt Linguist manual} for more information about
- translating Qt application.
-
- \section1 Line by Line Walkthrough
-
- In \c arrowpad.h we define the \c ArrowPad subclass which is a
- subclass of QWidget. In the screenshot above, the central
- widget with the four buttons is an \c ArrowPad.
-
- \snippet examples/linguist/arrowpad/arrowpad.h 0
- \snippet examples/linguist/arrowpad/arrowpad.h 1
- \snippet examples/linguist/arrowpad/arrowpad.h 2
-
- When \c lupdate is run it not only extracts the source texts but it
- also groups them into contexts. A context is the name of the class in
- which the source text appears. Thus, in this example, "ArrowPad" is a
- context: it is the context of the texts in the \c ArrowPad class.
- The \c Q_OBJECT macro defines \c tr(x) in \c ArrowPad like this:
-
- \snippet doc/src/snippets/code/doc_src_examples_arrowpad.cpp 0
-
- Knowing which class each source text appears in enables \e {Qt
- Linguist} to group texts that are logically related together, e.g.
- all the text in a dialog will have the context of the dialog's class
- name and will be shown together. This provides useful information for
- the translator since the context in which text appears may influence how
- it should be translated. For some translations keyboard
- accelerators may need to be changed and having all the source texts in a
- particular context (class) grouped together makes it easier for the
- translator to perform any accelerator changes without introducing
- conflicts.
-
- In \c arrowpad.cpp we implement the \c ArrowPad class.
-
- \snippet examples/linguist/arrowpad/arrowpad.cpp 0
- \snippet examples/linguist/arrowpad/arrowpad.cpp 1
- \snippet examples/linguist/arrowpad/arrowpad.cpp 2
- \snippet examples/linguist/arrowpad/arrowpad.cpp 3
-
- We call \c ArrowPad::tr() for each button's label since the labels are
- user-visible text.
-
- \image linguist-arrowpad_en.png
-
- \snippet examples/linguist/arrowpad/mainwindow.h 0
- \snippet examples/linguist/arrowpad/mainwindow.h 1
-
- In the screenshot above, the whole window is a \c MainWindow.
- This is defined in the \c mainwindow.h header file. Here too, we
- use \c Q_OBJECT, so that \c MainWindow will become a context in
- \e {Qt Linguist}.
-
- \snippet examples/linguist/arrowpad/mainwindow.cpp 0
-
- In the implementation of \c MainWindow, \c mainwindow.cpp, we create
- an instance of our \c ArrowPad class.
-
- \snippet examples/linguist/arrowpad/mainwindow.cpp 1
-
- We also call \c MainWindow::tr() twice, once for the action and
- once for the shortcut.
-
- Note the use of \c tr() to support different keys in other
- languages. "Ctrl+Q" is a good choice for Quit in English, but a
- Dutch translator might want to use "Ctrl+A" (for Afsluiten) and a
- German translator "Strg+E" (for Beenden). When using \c tr() for
- \uicontrol Ctrl key accelerators, the two argument form should be used
- with the second argument describing the function that the
- accelerator performs.
-
- Our \c main() function is defined in \c main.cpp as usual.
-
- \snippet examples/linguist/arrowpad/main.cpp 2
- \snippet examples/linguist/arrowpad/main.cpp 3
-
- We choose which translation to use according to the current locale.
- QLocale::system() can be influenced by setting the \c LANG
- environment variable, for example. Notice that the use of a naming
- convention that incorporates the locale for \c .qm message files,
- (and TS files), makes it easy to implement choosing the
- translation file according to locale.
-
- If there is no QM message file for the locale chosen the original
- source text will be used and no error raised.
-
- \section1 Translating to French and Dutch
-
- We'll begin by translating the example application into French. Start
- \e {Qt Linguist} with \c arrowpad_fr.ts. You should get the seven source
- texts ("\&Up", "\&Left", etc.) grouped in two contexts ("ArrowPad"
- and "MainWindow").
-
- Now, enter the following translations:
-
- \list
- \li \c ArrowPad
- \list
- \li \&Up - \&Haut
- \li \&Left - \&Gauche
- \li \&Right - \&Droite
- \li \&Down - \&Bas
- \endlist
- \li \c MainWindow
- \list
- \li E\&xit - \&Quitter
- \li Ctrl+Q - Ctrl+Q
- \li \&File - \&Fichier
- \endlist
- \endlist
-
- It's quickest to press \uicontrol{Alt+D} (which clicks the \uicontrol {Done \& Next}
- button) after typing each translation, since this marks the
- translation as done and moves on to the next source text.
-
- Save the file and do the same for Dutch working with \c arrowpad_nl.ts:
-
- \list
- \li \c ArrowPad
- \list
- \li \&Up - \&Omhoog
- \li \&Left - \&Links
- \li \&Right - \&Rechts
- \li \&Down - Omlaa\&g
- \endlist
- \li \c MainWindow
- \list
- \li E\&xit - \&Afsluiten
- \li Ctrl+Q - Ctrl+A
- \li File - \&Bestand
- \endlist
- \endlist
-
- We have to convert the \c tt1_fr.ts and \c tt1_nl.ts translation source
- files into QM files. We could use \e {Qt Linguist} as we've done
- before; however using the command line tool \c lrelease ensures that
- \e all the QM files for the application are created without us
- having to remember to load and \uicontrol File|Release each one
- individually from \e {Qt Linguist}.
-
- Type
-
- \snippet doc/src/snippets/code/doc_src_examples_arrowpad.qdoc 1
-
- This should create both \c arrowpad_fr.qm and \c arrowpad_nl.qm. Set the \c
- LANG environment variable to \c fr. In Unix, one of the two following
- commands should work
-
- \snippet doc/src/snippets/code/doc_src_examples_arrowpad.qdoc 2
-
- In Windows, either modify \c autoexec.bat or run
-
- \snippet doc/src/snippets/code/doc_src_examples_arrowpad.qdoc 3
-
- When you run the program, you should now see the French version:
-
- \image linguist-arrowpad_fr.png
-
- Try the same with Dutch, by setting \c LANG=nl. Now the Dutch
- version should appear:
-
- \image linguist-arrowpad_nl.png
-
- \section1 Exercises
-
- Mark one of the translations in \e {Qt Linguist} as not done, i.e.
- by unchecking the "done" checkbox; run \c lupdate, then \c lrelease,
- then the example. What effect did this change have?
-
- Set \c LANG=fr_CA (French Canada) and run the example program again.
- Explain why the result is the same as with \c LANG=fr.
-
- Change one of the accelerators in the Dutch translation to eliminate the
- conflict between \e \&Bestand and \e \&Boven.
-*/
diff --git a/doc/src/examples/hellotr.qdoc b/doc/src/examples/hellotr.qdoc
deleted file mode 100644
index ca4d4282ad..0000000000
--- a/doc/src/examples/hellotr.qdoc
+++ /dev/null
@@ -1,174 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \example linguist/hellotr
- \title Hello tr() Example
-
- This example is a small Hello World program with a Latin translation. The
- screenshot below shows the English version.
-
- \image linguist-hellotr_en.png
-
- See the \l{Qt Linguist manual} for more information about
- translating Qt application.
-
- \section1 Line by Line Walkthrough
-
-
- \snippet examples/linguist/hellotr/main.cpp 0
-
- This line includes the definition of the QTranslator class.
- Objects of this class provide translations for user-visible text.
-
- \snippet examples/linguist/hellotr/main.cpp 5
-
- Creates a QTranslator object without a parent.
-
- \snippet examples/linguist/hellotr/main.cpp 6
-
- Tries to load a file called \c hellotr_la.qm (the \c .qm file extension is
- implicit) that contains Latin translations for the source texts used in
- the program. No error will occur if the file is not found.
-
- \snippet examples/linguist/hellotr/main.cpp 7
-
- Adds the translations from \c hellotr_la.qm to the pool of translations used
- by the program.
-
- \snippet examples/linguist/hellotr/main.cpp 8
-
- Creates a push button that displays "Hello world!". If \c hellotr_la.qm
- was found and contains a translation for "Hello world!", the
- translation appears; if not, the source text appears.
-
- All classes that inherit QObject have a \c tr() function. Inside
- a member function of a QObject class, we simply write \c tr("Hello
- world!") instead of \c QPushButton::tr("Hello world!") or \c
- QObject::tr("Hello world!").
-
- \section1 Running the Application in English
-
- Since we haven't made the translation file \c hellotr_la.qm, the source text
- is shown when we run the application:
-
- \image linguist-hellotr_en.png
-
- \section1 Creating a Latin Message File
-
- The first step is to create a project file, \c hellotr.pro, that lists
- all the source files for the project. The project file can be a qmake
- project file, or even an ordinary makefile. Any file that contains
-
- \snippet examples/linguist/hellotr/hellotr.pro 0
- \snippet examples/linguist/hellotr/hellotr.pro 1
-
- will work. \c TRANSLATIONS specifies the message files we want to
- maintain. In this example, we just maintain one set of translations,
- namely Latin.
-
- Note that the file extension is \c .ts, not \c .qm. The \c .ts
- translation source format is designed for use during the
- application's development. Programmers or release managers run
- the \c lupdate program to generate and update TS files with
- the source text that is extracted from the source code.
- Translators read and update the TS files using \e {Qt
- Linguist} adding and editing their translations.
-
- The TS format is human-readable XML that can be emailed directly
- and is easy to put under version control. If you edit this file
- manually, be aware that the default encoding for XML is UTF-8, not
- Latin1 (ISO 8859-1). One way to type in a Latin1 character such as
- '\oslash' (Norwegian o with slash) is to use an XML entity:
- "\&#xf8;". This will work for any Unicode 4.0 character.
-
- Once the translations are complete the \c lrelease program is used to
- convert the TS files into the QM Qt message file format. The
- QM format is a compact binary format designed to deliver very
- fast lookup performance. Both \c lupdate and \c lrelease read all the
- project's source and header files (as specified in the HEADERS and
- SOURCES lines of the project file) and extract the strings that
- appear in \c tr() function calls.
-
- \c lupdate is used to create and update the message files (\c hellotr_la.ts
- in this case) to keep them in sync with the source code. It is safe to
- run \c lupdate at any time, as \c lupdate does not remove any
- information. For example, you can put it in the makefile, so the TS
- files are updated whenever the source changes.
-
- Try running \c lupdate right now, like this:
-
- \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 0
-
- (The \c -verbose option instructs \c lupdate to display messages that
- explain what it is doing.) You should now have a file \c hellotr_la.ts in
- the current directory, containing this:
-
- \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 1
-
- You don't need to understand the file format since it is read and
- updated using tools (\c lupdate, \e {Qt Linguist}, \c lrelease).
-
- \section1 Translating to Latin with Qt Linguist
-
- We will use \e {Qt Linguist} to provide the translation, although
- you can use any XML or plain text editor to enter a translation into a
- TS file.
-
- To start \e {Qt Linguist}, type
-
- \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 2
-
- You should now see the text "QPushButton" in the top left pane.
- Double-click it, then click on "Hello world!" and enter "Orbis, te
- saluto!" in the \uicontrol Translation pane (the middle right of the
- window). Don't forget the exclamation mark!
-
- Click the \uicontrol Done checkbox and choose \uicontrol File|Save from the
- menu bar. The TS file will no longer contain
-
- \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 3
-
- but instead will have
-
- \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 4
-
- \section1 Running the Application in Latin
-
- To see the application running in Latin, we have to generate a QM
- file from the TS file. Generating a QM file can be achieved
- either from within \e {Qt Linguist} (for a single TS file), or
- by using the command line program \c lrelease which will produce one
- QM file for each of the TS files listed in the project file.
- Generate \c hellotr_la.qm from \c hellotr_la.ts by choosing
- \uicontrol File|Release from \e {Qt Linguist}'s menu bar and pressing
- \uicontrol Save in the file save dialog that pops up. Now run the \c hellotr
- program again. This time the button will be labelled "Orbis, te
- saluto!".
-
- \image linguist-hellotr_la.png
-*/
diff --git a/doc/src/examples/multipleinheritance.qdoc b/doc/src/examples/multipleinheritance.qdoc
deleted file mode 100644
index 541dc3c719..0000000000
--- a/doc/src/examples/multipleinheritance.qdoc
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \example uitools/multipleinheritance
- \title Multiple Inheritance Example
-
- The Multiple Inheritance Example shows how to use a form created with
- Qt Designer in an application by subclassing both QWidget and the user
- interface class, which is \c{Ui::CalculatorForm}.
-
- \image multipleinheritance-example.png
-
- To subclass the \c calculatorform.ui file and ensure that \c qmake
- processes it with the \c uic, we have to include \c calculatorform.ui
- in the \c .pro file, as shown below:
-
- \snippet examples/uitools/multipleinheritance/multipleinheritance.pro 0
-
- When the project is compiled, the \c uic will generate a corresponding
- \c ui_calculatorform.h.
-
- \section1 CalculatorForm Definition
-
- In the \c CalculatorForm definition, we include the \c ui_calculatorform.h
- that was generated earlier.
-
- \snippet examples/uitools/multipleinheritance/calculatorform.h 0
-
- As mentioned earlier, the class is a subclass of both QWidget and
- \c{Ui::CalculatorForm}.
-
- \snippet examples/uitools/multipleinheritance/calculatorform.h 1
-
- Two slots are defined according to the \l{Automatic Connections}
- {automatic connection} naming convention required by \c uic. This is
- to ensure that \l{QMetaObject}'s auto-connection facilities connect
- all the signals and slots involved automatically.
-
- \section1 CalculatorForm Implementation
-
- In the constructor, we call \c setupUi() to load the user interface file.
- Note that we do not need the \c{ui} prefix as \c CalculatorForm is a
- subclass of the user interface class.
-
- \snippet examples/uitools/multipleinheritance/calculatorform.cpp 0
-
- We include two slots, \c{on_inputSpinBox1_valueChanged()} and
- \c{on_inputSpinBox2_valueChanged()}. These slots respond to the
- \l{QSpinBox::valueChanged()}{valueChanged()} signal that both spin boxes
- emit. Whenever there is a change in one spin box's value, we take that
- value and add it to whatever value the other spin box has.
-
- \snippet examples/uitools/multipleinheritance/calculatorform.cpp 1
- \codeline
- \snippet examples/uitools/multipleinheritance/calculatorform.cpp 2
-
- \section1 \c main() Function
-
- The \c main() function instantiates QApplication and \c CalculatorForm.
- The \c calculator object is displayed by invoking the \l{QWidget::show()}
- {show()} function.
-
- \snippet examples/uitools/multipleinheritance/main.cpp 0
-
- There are various approaches to include forms into applications. The
- Multiple Inheritance approach is just one of them. See
- \l{Using a Designer UI File in Your Application} for more information on
- the other approaches available.
-*/
diff --git a/doc/src/examples/trollprint.qdoc b/doc/src/examples/trollprint.qdoc
deleted file mode 100644
index 5a4e84fd14..0000000000
--- a/doc/src/examples/trollprint.qdoc
+++ /dev/null
@@ -1,261 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \example linguist/trollprint
- \title Troll Print Example
-
- Troll Print is an example application that lets the user choose
- printer settings. It comes in two versions: English and
- Portuguese.
-
- \image linguist-trollprint_10_en.png
-
- We've included a translation file, \c trollprint_pt.ts, which contains some
- Portuguese translations for this example.
-
- We will consider two releases of the same application: Troll Print
- 1.0 and 1.1. We will learn to reuse the translations created for one
- release in a subsequent release. (In this tutorial, you need to edit
- some source files. It's probably best to copy all the files to a new
- temporary directory and work from there.)
-
- See the \l{Qt Linguist manual} for more information about
- translating Qt application.
-
- \section1 Line by Line Walkthrough
-
- The \c PrintPanel class is defined in \c printpanel.h.
-
- \snippet examples/linguist/trollprint/printpanel.h 0
-
- \c PrintPanel is a QWidget. It needs the \c Q_OBJECT macro for \c
- tr() to work properly.
-
- The implementation file is \c printpanel.cpp.
-
- \snippet examples/linguist/trollprint/printpanel.cpp 0
-
- Some of the code is commented out in Troll Print 1.0; you will
- uncomment it later, for Troll Print 1.1.
-
- \snippet examples/linguist/trollprint/printpanel.cpp 1
- \snippet examples/linguist/trollprint/printpanel.cpp 2
-
- Notice the two occurrences of \c tr("Enabled") and of \c
- tr("Disabled") in PrintPanel. Since both "Enabled"s and "Disabled"s
- appear in the same context \e {Qt Linguist} will only display one
- occurrence of each and will use the same translations for the
- duplicates that it doesn't display. Whilst this is a useful
- timesaver, in some languages, such as Portuguese, the second
- occurrence requires a separate translation. We will see how \e {Qt
- Linguist} can be made to display all the occurrences for separate
- translation shortly.
-
- The header file for \c MainWindow, \c mainwindow.h, contains no
- surprises. In the implementation, \c mainwindow.cpp, we have some
- user-visible source texts that must be marked for translation.
-
- \snippet examples/linguist/trollprint/mainwindow.cpp 0
-
- We must translate the window title.
-
- \snippet examples/linguist/trollprint/mainwindow.cpp 1
- \snippet examples/linguist/trollprint/mainwindow.cpp 3
-
- We also need to translate the actions and menus. Note that the
- two argument form of \c tr() is used for the keyboard
- accelerator, "Ctrl+Q", since the second argument is the only clue
- the translator has to indicate what function that accelerator
- will perform.
-
- \snippet examples/linguist/trollprint/main.cpp 0
-
- The \c main() function in \c main.cpp is the same as the one in
- the \l{linguist/arrowpad}{Arrow Pad} example. In particular, it
- chooses a translation file based on the current locale.
-
- \section1 Running Troll Print 1.0 in English and in Portuguese
-
- We will use the translations in the \c trollprint_pt.ts file that is provided.
-
- Set the \c LANG environment variable to \c pt, and then run \c
- trollprint. You should still see the English version. Now run \c
- lrelease, e.g. \c {lrelease trollprint.pro}, and then run the
- example again. Now you should see the Portuguese edition (Troll
- Imprimir 1.0):
-
- \image linguist-trollprint_10_pt_bad.png
-
- Whilst the translation has appeared correctly, it is in fact wrong. In
- good Portuguese, the second occurrence of "Enabled" should be
- "Ativadas", not "Ativado" and the ending for the second translation of
- "Disabled" must change similarly too.
-
- If you open \c trollprint_pt.ts using \e {Qt Linguist}, you will see that
- there is just one occurrence of "Enabled" and of "Disabled" in the
- translation source file, even though there are two of each in the
- source code. This is because \e {Qt Linguist} tries to minimize the
- translator's work by using the same translation for duplicate source
- texts. In cases such as this where an identical translation is wrong,
- the programmer must disambiguate the duplicate occurrences. This is
- easily achieved by using the two argument form of \c tr().
-
- We can easily determine which file must be changed because the
- translator's "context" is in fact the class name for the class where
- the texts that must be changed appears. In this case the file is \c
- printpanel.cpp, where there are four lines to change. Add the
- second argument "two-sided" in the appropriate \c tr() calls to the
- first pair of radio buttons:
-
- \snippet doc/src/snippets/code/doc_src_examples_trollprint.cpp 0
-
- and add the second argument "colors" in the appropriate \c tr() calls
- for the second pair of radio buttons:
-
- \snippet doc/src/snippets/code/doc_src_examples_trollprint.cpp 1
-
- Now run \c lupdate and open \c trollprint_pt.ts with \e {Qt Linguist}. You
- should now see two changes.
-
- First, the translation source file now contains \e three "Enabled",
- "Disabled" pairs. The first pair is marked "(obs.)" signifying that they
- are obsolete. This is because these texts appeared in \c tr() calls that
- have been replaced by new calls with two arguments. The second pair has
- "two-sided" as their comment, and the third pair has "colors" as their
- comment. The comments are shown in the \uicontrol {Source text and comments}
- area in \e {Qt Linguist}.
-
- Second, the translation text "Ativado" and "Desativado" have been
- automatically used as translations for the new "Enabled" and "Disabled"
- texts, again to minimize the translator's work. Of course in this case
- these are not correct for the second occurrence of each word, but they
- provide a good starting point.
-
- Change the second "Ativado" into "Ativadas" and the second
- "Desativado" into "Desativadas", then save and quit. Run \c lrelease
- to obtain an up-to-date binary \c trollprint_pt.qm file, and run Troll Print
- (or rather Troll Imprimir).
-
- \image linguist-trollprint_10_pt_good.png
-
- The second argument to \c tr() calls, called "comments" in \e {Qt
- Linguist}, distinguish between identical source texts that occur in
- the same context (class). They are also useful in other cases to give
- clues to the translator, and in the case of Ctrl key accelerators are
- the only means of conveying the function performed by the accelerator to
- the translator.
-
- An additional way of helping the translator is to provide information on
- how to navigate to the particular part of the application that contains
- the source texts they must translate. This helps them see the context
- in which the translation appears and also helps them to find and test
- the translations. This can be achieved by using a \c TRANSLATOR comment
- in the source code:
-
- \snippet doc/src/snippets/code/doc_src_examples_trollprint.cpp 2
-
- Try adding these comments to some source files, particularly to
- dialog classes, describing the navigation necessary to reach the
- dialogs. You could also add them to the example files, e.g. \c
- mainwindow.cpp and \c printpanel.cpp are appropriate files. Run \c
- lupdate and then start \e {Qt Linguist} and load in \c trollprint_pt.ts.
- You should see the comments in the \uicontrol {Source text and comments} area
- as you browse through the list of source texts.
-
- Sometimes, particularly with large programs, it can be difficult for
- the translator to find their translations and check that they're
- correct. Comments that provide good navigation information can save
- them time:
-
- \snippet doc/src/snippets/code/doc_src_examples_trollprint.cpp 3
-
- \section1 Troll Print 1.1
-
- We'll now prepare release 1.1 of Troll Print. Start your favorite text
- editor and follow these steps:
-
- \list
- \li Uncomment the two lines that create a QLabel with the text
- "\<b\>TROLL PRINT\</b\>" in \c printpanel.cpp.
- \li Word-tidying: Replace "2-sided" by "Two-sided" in \c printpanel.cpp.
- \li Replace "1.0" with "1.1" everywhere it occurs in \c mainwindow.cpp.
- \li Update the copyright year to 1999-2000 in \c mainwindow.cpp.
- \endlist
-
- (Of course the version number and copyright year would be consts or
- #defines in a real application.)
-
- Once finished, run \c lupdate, then open \c trollprint_pt.ts in \e {Qt
- Linguist}. The following items are of special interest:
-
- \list
- \li \c MainWindow
- \list
- \li Troll Print 1.0 - marked "(obs.)", obsolete
- \li About Troll Print 1.0 - marked "(obs.)", obsolete
- \li Troll Print 1.0. Copyright 1999 Software, Inc. -
- marked obsolete
- \li Troll Print 1.1 - automatically translated as
- "Troll Imprimir 1.1"
- \li About Troll Print 1.1 - automatically translated as
- "Troll Imprimir 1.1"
- \li Troll Print 1.1. Copyright 1999-2000 Software,
- Inc. - automatically translated as "Troll Imprimir 1.1.
- Copyright 1999-2000 Software, Inc."
- \endlist
- \li \c PrintPanel
- \list
- \li 2-sided - marked "(obs.)", obsolete
- \li \<b\>TROLL PRINT\</b\> - unmarked, i.e. untranslated
- \li Two-sided - unmarked, i.e. untranslated.
- \endlist
- \endlist
-
- Notice that \c lupdate works hard behind the scenes to make revisions
- easier, and it's pretty smart with numbers.
-
- Go over the translations in \c MainWindow and mark these as "done".
- Translate "\<b\>TROLL PRINT\</b\>" as "\<b\>TROLL IMPRIMIR\</b\>".
- When you're translating "Two-sided", press the \uicontrol {Guess Again}
- button to translate "Two-sided", but change the "2" into "Dois".
-
- Save and quit, then run \c lrelease. The Portuguese version
- should look like this:
-
- \image linguist-trollprint_11_pt.png
-
- Choose \uicontrol{Ajuda|Sobre} (\uicontrol{Help|About}) to see the about box.
-
- If you choose \uicontrol {Ajuda|Sobre Qt} (\uicontrol {Help|About Qt}), you'll get
- an English dialog. Oops! Qt itself needs to be translated. See
- \l{Internationalization with Qt} for details.
-
- Now set \c LANG=en to get the original English version:
-
- \image linguist-trollprint_11_en.png
-*/
diff --git a/doc/src/images/linguist-arrowpad_en.png b/doc/src/images/linguist-arrowpad_en.png
deleted file mode 100644
index 9a95eb24ff..0000000000
--- a/doc/src/images/linguist-arrowpad_en.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/linguist-arrowpad_fr.png b/doc/src/images/linguist-arrowpad_fr.png
deleted file mode 100644
index fc33f9fd73..0000000000
--- a/doc/src/images/linguist-arrowpad_fr.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/linguist-arrowpad_nl.png b/doc/src/images/linguist-arrowpad_nl.png
deleted file mode 100644
index f2645a81b3..0000000000
--- a/doc/src/images/linguist-arrowpad_nl.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/linguist-hellotr_en.png b/doc/src/images/linguist-hellotr_en.png
deleted file mode 100644
index 6b3d8072cd..0000000000
--- a/doc/src/images/linguist-hellotr_en.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/linguist-hellotr_la.png b/doc/src/images/linguist-hellotr_la.png
deleted file mode 100644
index f1ecdb07ad..0000000000
--- a/doc/src/images/linguist-hellotr_la.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/linguist-trollprint_10_en.png b/doc/src/images/linguist-trollprint_10_en.png
deleted file mode 100644
index e460481f96..0000000000
--- a/doc/src/images/linguist-trollprint_10_en.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/linguist-trollprint_10_pt_bad.png b/doc/src/images/linguist-trollprint_10_pt_bad.png
deleted file mode 100644
index b96d477240..0000000000
--- a/doc/src/images/linguist-trollprint_10_pt_bad.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/linguist-trollprint_10_pt_good.png b/doc/src/images/linguist-trollprint_10_pt_good.png
deleted file mode 100644
index 293c44a746..0000000000
--- a/doc/src/images/linguist-trollprint_10_pt_good.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/linguist-trollprint_11_en.png b/doc/src/images/linguist-trollprint_11_en.png
deleted file mode 100644
index f718c995c0..0000000000
--- a/doc/src/images/linguist-trollprint_11_en.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/linguist-trollprint_11_pt.png b/doc/src/images/linguist-trollprint_11_pt.png
deleted file mode 100644
index 0ff8c399b3..0000000000
--- a/doc/src/images/linguist-trollprint_11_pt.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/images/openglwindow-example.png b/doc/src/images/openglwindow-example.png
deleted file mode 100644
index 63ba4ed2f4..0000000000
--- a/doc/src/images/openglwindow-example.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/snippets/code/doc_src_examples_arrowpad.cpp b/doc/src/snippets/code/doc_src_examples_arrowpad.cpp
deleted file mode 100644
index 58e790d3ae..0000000000
--- a/doc/src/snippets/code/doc_src_examples_arrowpad.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-** of its contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-qApp->translate("ArrowPad", x)
-//! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_arrowpad.qdoc b/doc/src/snippets/code/doc_src_examples_arrowpad.qdoc
deleted file mode 100644
index 4b3ea343a3..0000000000
--- a/doc/src/snippets/code/doc_src_examples_arrowpad.qdoc
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-** of its contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [1]
-lrelease arrowpad.pro
-//! [1]
-
-
-//! [2]
-export LANG=fr
-setenv LANG fr
-//! [2]
-
-
-//! [3]
-set LANG=fr
-//! [3]
diff --git a/doc/src/snippets/code/doc_src_examples_hellotr.qdoc b/doc/src/snippets/code/doc_src_examples_hellotr.qdoc
deleted file mode 100644
index 2e57cac8a5..0000000000
--- a/doc/src/snippets/code/doc_src_examples_hellotr.qdoc
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-** of its contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-lupdate -verbose hellotr.pro
-//! [0]
-
-
-//! [1]
-<!DOCTYPE TS><TS>
-<context>
- <name>QPushButton</name>
- <message>
- <source>Hello world!</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-</TS>
-//! [1]
-
-
-//! [2]
-linguist hellotr_la.ts
-//! [2]
-
-
-//! [3]
-<translation type='unfinished'></translation>
-//! [3]
-
-
-//! [4]
-<translation>Orbis, te saluto!</translation>
-//! [4]
diff --git a/doc/src/snippets/code/doc_src_examples_textfinder.pro b/doc/src/snippets/code/doc_src_examples_textfinder.pro
deleted file mode 100644
index 4446e8eb7b..0000000000
--- a/doc/src/snippets/code/doc_src_examples_textfinder.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-#! [0]
-QT += uitools
-HEADERS = textfinder.h
-RESOURCES = textfinder.qrc
-SOURCES = textfinder.cpp main.cpp
-#! [0]
diff --git a/doc/src/snippets/code/doc_src_examples_trollprint.cpp b/doc/src/snippets/code/doc_src_examples_trollprint.cpp
deleted file mode 100644
index 493e245e83..0000000000
--- a/doc/src/snippets/code/doc_src_examples_trollprint.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-** of its contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-twoSidedEnabledRadio = new QRadioButton(tr("Enabled", "two-sided"));
-twoSidedDisabledRadio = new QRadioButton(tr("Disabled", "two-sided"));
-//! [0]
-
-
-//! [1]
-colorsEnabledRadio = new QRadioButton(tr("Enabled", "colors"), colors);
-colorsDisabledRadio = new QRadioButton(tr("Disabled", "colors"), colors);
-//! [1]
-
-
-//! [2]
-/*
- TRANSLATOR MainWindow
-
- In this application the whole application is a MainWindow.
- Choose Help|About from the menu bar to see some text
- belonging to MainWindow.
-
- ...
-*/
-//! [2]
-
-
-//! [3]
-/*
- TRANSLATOR ZClientErrorDialog
-
- Choose Client|Edit to reach the Client Edit dialog, then choose
- Client Specification from the drop down list at the top and pick
- client Bartel Leendert van der Waerden. Now check the Profile
- checkbox and then click the Start Processing button. You should
- now see a pop up window with the text "Error: Name too long!".
- This window is a ZClientErrorDialog.
-*/
-//! [3]