summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-07-06 13:55:40 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-07-06 14:08:02 +0200
commit314fdbce8ce473eb3610be3658c61fab2fac0efb (patch)
tree98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /examples
parent8d7647e286e07690de15a6ff9189307ee1a3517c (diff)
parent83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff)
Merge remote branch 'gerrit/master' into refactor
Conflicts: config.tests/unix/opengldesktop/opengldesktop.cpp examples/itemviews/interview/interview.pro examples/mainwindows/mainwindow/mainwindow.pro examples/openvg/README examples/richtext/textedit/textedit.pro examples/tools/undo/undo.pro src/corelib/global/qglobal.h src/corelib/kernel/qcoreapplication.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qmetatype.h src/gui/kernel/qevent.cpp src/gui/kernel/qevent.h src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/gui/text/qfontdatabase.cpp src/opengl/qgl.h src/openvg/qpaintengine_vg.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp tests/auto/qmainwindow/qmainwindow.pro Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'examples')
-rw-r--r--examples/animation/README32
-rw-r--r--examples/desktop/README33
-rw-r--r--examples/dialogs/README33
-rw-r--r--examples/draganddrop/README33
-rw-r--r--examples/graphicsview/README33
-rw-r--r--examples/ipc/README32
-rw-r--r--examples/itemviews/README33
-rw-r--r--examples/itemviews/interview/interview.pro8
-rw-r--r--examples/itemviews/itemviews.pro4
-rw-r--r--examples/itemviews/spreadsheet/spreadsheet.pro6
-rw-r--r--examples/layouts/README33
-rw-r--r--examples/linguist/README33
-rw-r--r--examples/mainwindows/README33
-rw-r--r--examples/mainwindows/macmainwindow/macmainwindow.pro4
-rw-r--r--examples/mainwindows/mainwindow/mainwindow.pro8
-rw-r--r--examples/mainwindows/mainwindows.pro3
-rw-r--r--examples/network/README33
-rw-r--r--examples/network/securesocketclient/certificateinfo.cpp28
-rw-r--r--examples/opengl/README33
-rw-r--r--examples/painting/README33
-rw-r--r--examples/painting/affine/affine.pro10
-rw-r--r--examples/painting/composition/composition.pro6
-rw-r--r--examples/painting/deform/deform.pro6
-rw-r--r--examples/painting/gradients/gradients.pro6
-rw-r--r--examples/painting/painting.pro21
-rw-r--r--examples/painting/pathstroke/pathstroke.pro6
-rw-r--r--examples/painting/shared/shared.pro4
-rw-r--r--examples/qtconcurrent/README33
-rw-r--r--examples/qtestlib/README32
-rw-r--r--examples/qws/README33
-rw-r--r--examples/richtext/README33
-rw-r--r--examples/richtext/richtext.pro3
-rw-r--r--examples/richtext/textedit/textedit.pro8
-rw-r--r--examples/sql/README33
-rw-r--r--examples/statemachine/README32
-rw-r--r--examples/threads/README33
-rw-r--r--examples/tools/README33
-rw-r--r--examples/tools/tools.pro1
-rw-r--r--examples/tools/undo/undo.pro6
-rw-r--r--examples/tutorials/README35
-rw-r--r--examples/webkit/webkit-guide/_index.html2
-rw-r--r--examples/widgets/README33
-rw-r--r--examples/xml/README33
43 files changed, 110 insertions, 820 deletions
diff --git a/examples/animation/README b/examples/animation/README
index 6a892f8655..e723a28722 100644
--- a/examples/animation/README
+++ b/examples/animation/README
@@ -3,36 +3,6 @@ smooth GUI's. By animating Qt properties, the framework provides great freedom
for animating widgets and other QObjects. The framework can also be used with
the Graphics View framework.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/desktop/README b/examples/desktop/README
index efe569a604..4a949d1cf7 100644
--- a/examples/desktop/README
+++ b/examples/desktop/README
@@ -6,36 +6,5 @@ support for desktop services can be used to improve the appearance of
applications and take advantage of underlying desktop facilities.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/dialogs/README b/examples/dialogs/README
index ab0f884fcb..090b011061 100644
--- a/examples/dialogs/README
+++ b/examples/dialogs/README
@@ -5,36 +5,5 @@ Custom dialogs can also be created for specialized modal or modeless
interactions with users.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/draganddrop/README b/examples/draganddrop/README
index f4efd2e40b..90dc55bf2f 100644
--- a/examples/draganddrop/README
+++ b/examples/draganddrop/README
@@ -5,36 +5,5 @@ most appropriate formats.
Drag and drop can also be implemented for internal use by applications.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/graphicsview/README b/examples/graphicsview/README
index 6c38c18683..e710fc3c13 100644
--- a/examples/graphicsview/README
+++ b/examples/graphicsview/README
@@ -5,36 +5,5 @@ These examples demonstrate the fundamental aspects of canvas programming
with Qt.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/ipc/README b/examples/ipc/README
index 71e2f46c18..83a157a42e 100644
--- a/examples/ipc/README
+++ b/examples/ipc/README
@@ -1,35 +1,5 @@
These examples demonstrate IPC support in Qt.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/itemviews/README b/examples/itemviews/README
index 0ac70f4904..bded96a849 100644
--- a/examples/itemviews/README
+++ b/examples/itemviews/README
@@ -4,36 +4,5 @@ from the way it is represented to the user, and provides support for
customized rendering through the use of delegates.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/itemviews/interview/interview.pro b/examples/itemviews/interview/interview.pro
index bf39328e99..fec3ec1168 100644
--- a/examples/itemviews/interview/interview.pro
+++ b/examples/itemviews/interview/interview.pro
@@ -11,10 +11,10 @@ build_all:!build_pass {
}
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/interview
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/interview
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
INSTALLS += target sources
-symbian: CONFIG += qt_demo
-QT += widgets widgets
+QT += widgets
+symbian: CONFIG += qt_example
diff --git a/examples/itemviews/itemviews.pro b/examples/itemviews/itemviews.pro
index d82e1ee0c0..3048aa18d6 100644
--- a/examples/itemviews/itemviews.pro
+++ b/examples/itemviews/itemviews.pro
@@ -8,12 +8,14 @@ SUBDIRS = addressbook \
editabletreemodel \
fetchmore \
frozencolumn \
+ interview \
pixelator \
puzzle \
simpledommodel \
simpletreemodel \
simplewidgetmapper \
- spinboxdelegate
+ spinboxdelegate \
+ spreadsheet
# install
sources.files = README *.pro
diff --git a/examples/itemviews/spreadsheet/spreadsheet.pro b/examples/itemviews/spreadsheet/spreadsheet.pro
index dc079866a3..6a3d8b5983 100644
--- a/examples/itemviews/spreadsheet/spreadsheet.pro
+++ b/examples/itemviews/spreadsheet/spreadsheet.pro
@@ -27,9 +27,9 @@ build_all:!build_pass {
}
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/spreadsheet
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/spreadsheet
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
INSTALLS += target sources
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example
diff --git a/examples/layouts/README b/examples/layouts/README
index edaea78463..589400280d 100644
--- a/examples/layouts/README
+++ b/examples/layouts/README
@@ -6,36 +6,5 @@ Custom layouts can be used to provide more control over the positions and
sizes of child widgets.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/linguist/README b/examples/linguist/README
index d1ef0057e4..15817742da 100644
--- a/examples/linguist/README
+++ b/examples/linguist/README
@@ -2,36 +2,5 @@ Internationalization is a core feature of Qt. These examples show how to
access translation and localization facilities at run-time.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/mainwindows/README b/examples/mainwindows/README
index 15a6c23e4b..b63adee6e3 100644
--- a/examples/mainwindows/README
+++ b/examples/mainwindows/README
@@ -5,36 +5,5 @@ separate forms of user input are unified in an integrated action system that
also supports keyboard shortcuts and accelerator keys in menu items.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/mainwindows/macmainwindow/macmainwindow.pro b/examples/mainwindows/macmainwindow/macmainwindow.pro
index 6773a669d0..8db88375f5 100644
--- a/examples/mainwindows/macmainwindow/macmainwindow.pro
+++ b/examples/mainwindows/macmainwindow/macmainwindow.pro
@@ -16,9 +16,9 @@ LIBS += -framework Cocoa -framework Carbon
# install
mac {
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/macmainwindow
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/macmainwindow
sources.files = $$SOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/macmainwindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/macmainwindow
INSTALLS += target sources
}
QT += widgets widgets
diff --git a/examples/mainwindows/mainwindow/mainwindow.pro b/examples/mainwindows/mainwindow/mainwindow.pro
index bbb7c80a21..afe03a5788 100644
--- a/examples/mainwindows/mainwindow/mainwindow.pro
+++ b/examples/mainwindows/mainwindow/mainwindow.pro
@@ -9,10 +9,10 @@ build_all:!build_pass {
RESOURCES += mainwindow.qrc
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/mainwindow
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow
sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/mainwindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow
INSTALLS += target sources
-symbian: CONFIG += qt_demo
-QT += widgets widgets
+QT += widgets
+symbian: CONFIG += qt_example
diff --git a/examples/mainwindows/mainwindows.pro b/examples/mainwindows/mainwindows.pro
index f685744228..9ed8e7aaff 100644
--- a/examples/mainwindows/mainwindows.pro
+++ b/examples/mainwindows/mainwindows.pro
@@ -1,10 +1,13 @@
TEMPLATE = subdirs
SUBDIRS = application \
+ mainwindow \
mdi \
menus \
recentfiles \
sdi
+mac* && !qpa: SUBDIRS += macmainwindow
+
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README
diff --git a/examples/network/README b/examples/network/README
index 23721df4c3..23682e4aef 100644
--- a/examples/network/README
+++ b/examples/network/README
@@ -5,36 +5,5 @@ These examples demonstrate the fundamental aspects of network programming
with Qt.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/network/securesocketclient/certificateinfo.cpp b/examples/network/securesocketclient/certificateinfo.cpp
index b1a9acb0b2..9c9ffdeb4c 100644
--- a/examples/network/securesocketclient/certificateinfo.cpp
+++ b/examples/network/securesocketclient/certificateinfo.cpp
@@ -65,8 +65,8 @@ void CertificateInfo::setCertificateChain(const QList<QSslCertificate> &chain)
for (int i = 0; i < chain.size(); ++i) {
const QSslCertificate &cert = chain.at(i);
form->certificationPathView->addItem(tr("%1%2 (%3)").arg(!i ? QString() : tr("Issued by: "))
- .arg(cert.subjectInfo(QSslCertificate::Organization))
- .arg(cert.subjectInfo(QSslCertificate::CommonName)));
+ .arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
+ .arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" "))));
}
form->certificationPathView->setCurrentIndex(0);
@@ -78,19 +78,19 @@ void CertificateInfo::updateCertificateInfo(int index)
if (index >= 0 && index < chain.size()) {
const QSslCertificate &cert = chain.at(index);
QStringList lines;
- lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization))
- << tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName))
- << tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName))
- << tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName))
- << tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName))
- << tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName))
+ lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
+ << tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" ")))
+ << tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName).join(QLatin1String(" ")))
+ << tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName).join(QLatin1String(" ")))
+ << tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" ")))
+ << tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" ")))
<< QString()
- << tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization))
- << tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName))
- << tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName))
- << tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName))
- << tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName))
- << tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName));
+ << tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
+ << tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" ")))
+ << tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName).join(QLatin1String(" ")))
+ << tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName).join(QLatin1String(" ")))
+ << tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" ")))
+ << tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName).join(QLatin1String(" ")));
foreach (QString line, lines)
form->certificateInfoView->addItem(line);
} else {
diff --git a/examples/opengl/README b/examples/opengl/README
index 69bd134246..b891fb4192 100644
--- a/examples/opengl/README
+++ b/examples/opengl/README
@@ -6,36 +6,5 @@ These examples demonstrate the basic techniques used to take advantage of
OpenGL in Qt applications.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/painting/README b/examples/painting/README
index 4f9dca0181..541c553159 100644
--- a/examples/painting/README
+++ b/examples/painting/README
@@ -7,36 +7,5 @@ with Qt, from basic concepts such as drawing simple primitives to the use of
transformations.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/painting/affine/affine.pro b/examples/painting/affine/affine.pro
index 4e4eee8882..1441811851 100644
--- a/examples/painting/affine/affine.pro
+++ b/examples/painting/affine/affine.pro
@@ -13,12 +13,16 @@ include($$SHARED_FOLDER/shared.pri)
RESOURCES += affine.qrc
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/affine
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/affine
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
INSTALLS += target sources
-symbian: CONFIG += qt_demo
+symbian {
+ CONFIG += qt_example
+}
+
+maemo5: CONFIG += qt_example
wince*: {
DEPLOYMENT_PLUGIN += qjpeg
diff --git a/examples/painting/composition/composition.pro b/examples/painting/composition/composition.pro
index 00c500ea3b..c8e5ab0af3 100644
--- a/examples/painting/composition/composition.pro
+++ b/examples/painting/composition/composition.pro
@@ -12,12 +12,12 @@ contains(QT_CONFIG, opengl) {
}
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/composition
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/composition
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
INSTALLS += target sources
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example
win32-msvc* {
QMAKE_CXXFLAGS += /Zm500
diff --git a/examples/painting/deform/deform.pro b/examples/painting/deform/deform.pro
index d1c8938ad0..2bfc5d32cd 100644
--- a/examples/painting/deform/deform.pro
+++ b/examples/painting/deform/deform.pro
@@ -13,12 +13,12 @@ contains(QT_CONFIG, opengl) {
}
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/deform
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/deform
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000A63D
- CONFIG += qt_demo
+ CONFIG += qt_example
}
diff --git a/examples/painting/gradients/gradients.pro b/examples/painting/gradients/gradients.pro
index ff292efba1..66f19c0801 100644
--- a/examples/painting/gradients/gradients.pro
+++ b/examples/painting/gradients/gradients.pro
@@ -12,9 +12,9 @@ contains(QT_CONFIG, opengl) {
}
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/gradients
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/gradients
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
INSTALLS += target sources
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example
diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro
index 68d4d73b62..263cc7326b 100644
--- a/examples/painting/painting.pro
+++ b/examples/painting/painting.pro
@@ -1,6 +1,12 @@
TEMPLATE = subdirs
SUBDIRS = basicdrawing \
concentriccircles \
+ examples_affine \
+ examples_composition \
+ examples_deform \
+ examples_gradients \
+ examples_pathstroke \
+ painting_shared \
imagecomposition \
painterpaths \
transformations \
@@ -15,3 +21,18 @@ INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
+
+examples_affine.subdir = affine
+examples_composition.subdir = composition
+examples_deform.subdir = deform
+examples_gradients.subdir = gradients
+examples_pathstroke.subdir = pathstroke
+painting_shared.subdir = shared
+
+!ordered {
+ examples_affine.depends = painting_shared
+ examples_deform.depends = painting_shared
+ examples_gradients.depends = painting_shared
+ examples_composition.depends = painting_shared
+ examples_pathstroke.depends = painting_shared
+}
diff --git a/examples/painting/pathstroke/pathstroke.pro b/examples/painting/pathstroke/pathstroke.pro
index af6482fb48..d3f6596390 100644
--- a/examples/painting/pathstroke/pathstroke.pro
+++ b/examples/painting/pathstroke/pathstroke.pro
@@ -13,12 +13,12 @@ contains(QT_CONFIG, opengl) {
}
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/pathstroke
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/pathstroke
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000A63E
- CONFIG += qt_demo
+ CONFIG += qt_example
}
diff --git a/examples/painting/shared/shared.pro b/examples/painting/shared/shared.pro
index 78aaaefe48..18f1d72398 100644
--- a/examples/painting/shared/shared.pro
+++ b/examples/painting/shared/shared.pro
@@ -26,9 +26,9 @@ HEADERS += \
RESOURCES += shared.qrc
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/shared
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/shared
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
INSTALLS += sources
!cross_compile:INSTALLS += target
diff --git a/examples/qtconcurrent/README b/examples/qtconcurrent/README
index af659af2cc..4a1a149789 100644
--- a/examples/qtconcurrent/README
+++ b/examples/qtconcurrent/README
@@ -3,36 +3,5 @@ concurrent programming which includes implementations of the well-known
map-reduce and filter-reduce algorithms.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/qtestlib/README b/examples/qtestlib/README
index e89bf5d726..7ca55b2eb3 100644
--- a/examples/qtestlib/README
+++ b/examples/qtestlib/README
@@ -4,35 +4,5 @@ in unit testing frameworks as well as extensions for testing graphical
user interfaces.
-The examples in this directory should be run from the command line so
-that output printed to the console can be examined.
-
-Documentation for these examples can be found via the "Tutorial and Examples"
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/qws/README b/examples/qws/README
index d7cf21a5c5..d24fa59a35 100644
--- a/examples/qws/README
+++ b/examples/qws/README
@@ -3,36 +3,5 @@ for use on systems with limited resources, specialized hardware, and small
screens.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/richtext/README b/examples/richtext/README
index 6697b237f5..647029b8a2 100644
--- a/examples/richtext/README
+++ b/examples/richtext/README
@@ -7,36 +7,5 @@ Text is rendered using anti-aliased outline fonts to provide the best
possible on-screen representation.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
index e60e9c345e..8b36c4ba42 100644
--- a/examples/richtext/richtext.pro
+++ b/examples/richtext/richtext.pro
@@ -1,7 +1,8 @@
TEMPLATE = subdirs
SUBDIRS = calendar \
orderform \
- syntaxhighlighter
+ syntaxhighlighter \
+ textedit
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext
diff --git a/examples/richtext/textedit/textedit.pro b/examples/richtext/textedit/textedit.pro
index 02561f82ba..e5732ebfd3 100644
--- a/examples/richtext/textedit/textedit.pro
+++ b/examples/richtext/textedit/textedit.pro
@@ -14,10 +14,10 @@ build_all:!build_pass {
}
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/textedit
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/textedit
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
INSTALLS += target sources
-symbian: CONFIG += qt_demo
-QT += widgets widgets
+QT += widgets
+symbian: CONFIG += qt_example
diff --git a/examples/sql/README b/examples/sql/README
index 56b4b3e11f..70f910114a 100644
--- a/examples/sql/README
+++ b/examples/sql/README
@@ -5,36 +5,5 @@ SQL support is integrated with Qt's model/view architecture, making it easier
to provide GUI integration for your database applications.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/statemachine/README b/examples/statemachine/README
index 2879e67d65..a0ac35a89b 100644
--- a/examples/statemachine/README
+++ b/examples/statemachine/README
@@ -1,36 +1,6 @@
Qt is provided with a powerful hierchical finite state machine through
the Qt State Machine classes.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/threads/README b/examples/threads/README
index e4b426f9c7..c5427ea9a9 100644
--- a/examples/threads/README
+++ b/examples/threads/README
@@ -5,36 +5,5 @@ mechanism can now be used to communicate between threads.
Additionally, it is now possible to move objects between threads.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/tools/README b/examples/tools/README
index b0926f2fb6..db5c107c82 100644
--- a/examples/tools/README
+++ b/examples/tools/README
@@ -5,36 +5,5 @@ Other classes provide application infrastructure support, handling plugin
loading and managing configuration files.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro
index fb138b188a..cfab2f9def 100644
--- a/examples/tools/tools.pro
+++ b/examples/tools/tools.pro
@@ -13,6 +13,7 @@ SUBDIRS = codecs \
settingseditor \
styleplugin \
treemodelcompleter \
+ undo \
undoframework
plugandpaint.depends = plugandpaintplugins
diff --git a/examples/tools/undo/undo.pro b/examples/tools/undo/undo.pro
index 89f06bdfc7..ace6e49e8a 100644
--- a/examples/tools/undo/undo.pro
+++ b/examples/tools/undo/undo.pro
@@ -10,10 +10,10 @@ build_all:!build_pass {
RESOURCES += undo.qrc
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
INSTALLS += target sources
-symbian: CONFIG += qt_demo
QT += widgets
+symbian: CONFIG += qt_example
diff --git a/examples/tutorials/README b/examples/tutorials/README
index 0aab26348b..54c0b17706 100644
--- a/examples/tutorials/README
+++ b/examples/tutorials/README
@@ -1,37 +1,6 @@
Qt is supplied with tutorials that have been written to provide developers
with an introduction to the Qt API.
-The example and demo launcher can be used to explore these tutorials, lets
-you view the documentation in Qt Assistant, and is able to launch each part
-in a series of tutorial programs.
-Documentation for tutorials can be found in the Tutorial and Examples section
-of the Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
+Documentation for tutorials can be found in the Tutorials
+link in the main documentation.
diff --git a/examples/webkit/webkit-guide/_index.html b/examples/webkit/webkit-guide/_index.html
index 709f951c8f..5d7dd11d63 100644
--- a/examples/webkit/webkit-guide/_index.html
+++ b/examples/webkit/webkit-guide/_index.html
@@ -94,7 +94,6 @@ a[href^='http://waplabdc.nokia-boston.com']:before { content: url(http://waplabd
<ul>
<li><a href="all-examples.html">Examples</a></li>
<li><a href="tutorials.html">Tutorials</a></li>
- <li><a href="demos.html">Demos</a></li>
<li><a href="qdeclarativeexamples.html">QML Examples</a></li>
</ul>
</li>
@@ -159,7 +158,6 @@ a[href^='http://waplabdc.nokia-boston.com']:before { content: url(http://waplabd
<ul id="ul003">
<li class="defaultLink"><a href="all-examples.html">Examples</a></li>
<li class="defaultLink"><a href="tutorials.html">Tutorials</a></li>
- <li class="defaultLink"><a href="demos.html">Demos</a></li>
<li class="defaultLink"><a href="qdeclarativeexamples.html">QML Examples</a></li>
</ul>
</div>
diff --git a/examples/widgets/README b/examples/widgets/README
index fd16c67acd..e862f07b71 100644
--- a/examples/widgets/README
+++ b/examples/widgets/README
@@ -9,36 +9,5 @@ be used to change the appearance of standard widgets and appropriately
written custom widgets.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/xml/README b/examples/xml/README
index a6d81bb58a..a1a963006d 100644
--- a/examples/xml/README
+++ b/examples/xml/README
@@ -5,36 +5,5 @@ classes enable more complex document-level operations to be performed on
XML files.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.