summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-07-12 12:52:22 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2011-07-12 12:52:22 +0200
commit2371147354d4436bb54c588662ac315dd4c2f940 (patch)
tree5c90b1dd18de394cff2fb4e1bedc628da3c7d341 /examples
parent54ec6d177e0e8fb04cd01e70461484a80ca1f7a4 (diff)
parent82454b6014a7ee0b048b4db8d64a21de849d4ab9 (diff)
Merge remote branch 'gerrit/master' into refactor
Conflicts: src/gui/image/qicon.cpp src/gui/image/qicon.h src/gui/image/qicon_p.h src/gui/text/qfontdatabase.cpp src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp sync.profile Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
Diffstat (limited to 'examples')
-rw-r--r--examples/README37
-rw-r--r--examples/embedded/embedded.pro2
-rwxr-xr-xexamples/embedded/styleexample/files/add.png (renamed from examples/embedded/styledemo/files/add.png)bin1474 -> 1474 bytes
-rw-r--r--examples/embedded/styleexample/files/application.qss (renamed from examples/embedded/styledemo/files/application.qss)0
-rw-r--r--examples/embedded/styleexample/files/blue.qss (renamed from examples/embedded/styledemo/files/blue.qss)0
-rw-r--r--examples/embedded/styleexample/files/khaki.qss (renamed from examples/embedded/styledemo/files/khaki.qss)0
-rw-r--r--examples/embedded/styleexample/files/nature_1.jpg (renamed from examples/embedded/styledemo/files/nature_1.jpg)bin167443 -> 167443 bytes
-rw-r--r--examples/embedded/styleexample/files/nostyle.qss (renamed from examples/embedded/styledemo/files/nostyle.qss)0
-rwxr-xr-xexamples/embedded/styleexample/files/remove.png (renamed from examples/embedded/styledemo/files/remove.png)bin865 -> 865 bytes
-rw-r--r--examples/embedded/styleexample/files/transparent.qss (renamed from examples/embedded/styledemo/files/transparent.qss)0
-rw-r--r--examples/embedded/styleexample/main.cpp (renamed from examples/embedded/styledemo/main.cpp)2
-rw-r--r--examples/embedded/styleexample/styleexample.pro (renamed from examples/embedded/styledemo/styledemo.pro)8
-rw-r--r--examples/embedded/styleexample/styleexample.qrc (renamed from examples/embedded/styledemo/styledemo.qrc)0
-rw-r--r--examples/embedded/styleexample/stylewidget.cpp (renamed from examples/embedded/styledemo/stylewidget.cpp)0
-rw-r--r--examples/embedded/styleexample/stylewidget.h (renamed from examples/embedded/styledemo/stylewidget.h)0
-rw-r--r--examples/embedded/styleexample/stylewidget.ui (renamed from examples/embedded/styledemo/stylewidget.ui)2
-rw-r--r--examples/graphicsview/chip/mainwindow.cpp2
-rw-r--r--examples/graphicsview/embeddeddialogs/main.cpp2
-rw-r--r--examples/mainwindows/mainwindow/mainwindow.cpp4
-rw-r--r--examples/painting/affine/xform.cpp2
-rw-r--r--examples/painting/composition/composition.html4
-rw-r--r--examples/richtext/textedit/example.html4
22 files changed, 19 insertions, 50 deletions
diff --git a/examples/README b/examples/README
index 10e14ceef4..9e781a93a4 100644
--- a/examples/README
+++ b/examples/README
@@ -1,39 +1,8 @@
-Qt is supplied with a number of example applications and demonstrations that
-have been written to provide developers with examples of the Qt API in use,
+Qt is supplied with a number of example applications that have been
+written to provide developers with examples of the Qt API in use,
highlight good programming practice, and showcase features found in each of
Qt's core technologies.
-The example and demo launcher can be used to explore the different categories
-available. It provides an overview of each example, lets you view the
-documentation in Qt Assistant, and is able to launch examples and demos.
-Documentation for examples can be found in the Tutorials and Examples section
+Documentation for examples can be found in the 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.
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
index b9ff53fb12..8670fcb3a5 100644
--- a/examples/embedded/embedded.pro
+++ b/examples/embedded/embedded.pro
@@ -1,5 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS = styledemo raycasting flickable digiflip
+SUBDIRS = styleexample raycasting flickable digiflip
SUBDIRS += lightmaps
SUBDIRS += flightinfo
diff --git a/examples/embedded/styledemo/files/add.png b/examples/embedded/styleexample/files/add.png
index fc5c16d4c8..fc5c16d4c8 100755
--- a/examples/embedded/styledemo/files/add.png
+++ b/examples/embedded/styleexample/files/add.png
Binary files differ
diff --git a/examples/embedded/styledemo/files/application.qss b/examples/embedded/styleexample/files/application.qss
index 432fe6bc76..432fe6bc76 100644
--- a/examples/embedded/styledemo/files/application.qss
+++ b/examples/embedded/styleexample/files/application.qss
diff --git a/examples/embedded/styledemo/files/blue.qss b/examples/embedded/styleexample/files/blue.qss
index ac8671b5e4..ac8671b5e4 100644
--- a/examples/embedded/styledemo/files/blue.qss
+++ b/examples/embedded/styleexample/files/blue.qss
diff --git a/examples/embedded/styledemo/files/khaki.qss b/examples/embedded/styleexample/files/khaki.qss
index b0d4a0fa6f..b0d4a0fa6f 100644
--- a/examples/embedded/styledemo/files/khaki.qss
+++ b/examples/embedded/styleexample/files/khaki.qss
diff --git a/examples/embedded/styledemo/files/nature_1.jpg b/examples/embedded/styleexample/files/nature_1.jpg
index 3a04edb96a..3a04edb96a 100644
--- a/examples/embedded/styledemo/files/nature_1.jpg
+++ b/examples/embedded/styleexample/files/nature_1.jpg
Binary files differ
diff --git a/examples/embedded/styledemo/files/nostyle.qss b/examples/embedded/styleexample/files/nostyle.qss
index e69de29bb2..e69de29bb2 100644
--- a/examples/embedded/styledemo/files/nostyle.qss
+++ b/examples/embedded/styleexample/files/nostyle.qss
diff --git a/examples/embedded/styledemo/files/remove.png b/examples/embedded/styleexample/files/remove.png
index a0ab1fa21a..a0ab1fa21a 100755
--- a/examples/embedded/styledemo/files/remove.png
+++ b/examples/embedded/styleexample/files/remove.png
Binary files differ
diff --git a/examples/embedded/styledemo/files/transparent.qss b/examples/embedded/styleexample/files/transparent.qss
index b38eb366f4..b38eb366f4 100644
--- a/examples/embedded/styledemo/files/transparent.qss
+++ b/examples/embedded/styleexample/files/transparent.qss
diff --git a/examples/embedded/styledemo/main.cpp b/examples/embedded/styleexample/main.cpp
index 7a484b0365..d3c228a59e 100644
--- a/examples/embedded/styledemo/main.cpp
+++ b/examples/embedded/styleexample/main.cpp
@@ -45,7 +45,7 @@
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
- Q_INIT_RESOURCE(styledemo);
+ Q_INIT_RESOURCE(styleexample);
app.setApplicationName("style");
app.setOrganizationName("Nokia");
diff --git a/examples/embedded/styledemo/styledemo.pro b/examples/embedded/styleexample/styleexample.pro
index e8a428106c..5b1273e6aa 100644
--- a/examples/embedded/styledemo/styledemo.pro
+++ b/examples/embedded/styleexample/styleexample.pro
@@ -4,15 +4,15 @@ TEMPLATE = app
HEADERS += stylewidget.h
FORMS += stylewidget.ui
SOURCES += main.cpp stylewidget.cpp
-RESOURCES += styledemo.qrc
+RESOURCES += styleexample.qrc
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/styledemo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/styledemo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000A63F
- CONFIG += qt_demo
+ CONFIG += qt_example
}
QT += widgets widgets
diff --git a/examples/embedded/styledemo/styledemo.qrc b/examples/embedded/styleexample/styleexample.qrc
index 96237d4203..96237d4203 100644
--- a/examples/embedded/styledemo/styledemo.qrc
+++ b/examples/embedded/styleexample/styleexample.qrc
diff --git a/examples/embedded/styledemo/stylewidget.cpp b/examples/embedded/styleexample/stylewidget.cpp
index 7bac8a84d7..7bac8a84d7 100644
--- a/examples/embedded/styledemo/stylewidget.cpp
+++ b/examples/embedded/styleexample/stylewidget.cpp
diff --git a/examples/embedded/styledemo/stylewidget.h b/examples/embedded/styleexample/stylewidget.h
index 11fa5348de..11fa5348de 100644
--- a/examples/embedded/styledemo/stylewidget.h
+++ b/examples/embedded/styleexample/stylewidget.h
diff --git a/examples/embedded/styledemo/stylewidget.ui b/examples/embedded/styleexample/stylewidget.ui
index 767f44aead..ebe2961ec6 100644
--- a/examples/embedded/styledemo/stylewidget.ui
+++ b/examples/embedded/styleexample/stylewidget.ui
@@ -314,7 +314,7 @@
</layout>
</widget>
<resources>
- <include location="StyleDemo.qrc"/>
+ <include location="styleexample.qrc"/>
</resources>
<connections>
<connection>
diff --git a/examples/graphicsview/chip/mainwindow.cpp b/examples/graphicsview/chip/mainwindow.cpp
index dd33f0fc56..a8f4675c13 100644
--- a/examples/graphicsview/chip/mainwindow.cpp
+++ b/examples/graphicsview/chip/mainwindow.cpp
@@ -78,7 +78,7 @@ MainWindow::MainWindow(QWidget *parent)
layout->addWidget(vSplitter);
setLayout(layout);
- setWindowTitle(tr("Chip Demo"));
+ setWindowTitle(tr("Chip Example"));
}
void MainWindow::populateScene()
diff --git a/examples/graphicsview/embeddeddialogs/main.cpp b/examples/graphicsview/embeddeddialogs/main.cpp
index 76d77538d8..0dc61a4930 100644
--- a/examples/graphicsview/embeddeddialogs/main.cpp
+++ b/examples/graphicsview/embeddeddialogs/main.cpp
@@ -78,6 +78,6 @@ int main(int argc, char *argv[])
view.setBackgroundBrush(QPixmap(":/No-Ones-Laughing-3.jpg"));
view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
view.show();
- view.setWindowTitle("Embedded Dialogs Demo");
+ view.setWindowTitle("Embedded Dialogs Example");
return app.exec();
}
diff --git a/examples/mainwindows/mainwindow/mainwindow.cpp b/examples/mainwindows/mainwindow/mainwindow.cpp
index a58a713c0b..ef1485a147 100644
--- a/examples/mainwindows/mainwindow/mainwindow.cpp
+++ b/examples/mainwindows/mainwindow/mainwindow.cpp
@@ -64,7 +64,7 @@
#include <qdebug.h>
static const char * const message =
- "<p><b>Qt Main Window Demo</b></p>"
+ "<p><b>Qt Main Window Example</b></p>"
"<p>This is a demonstration of the QMainWindow, QToolBar and "
"QDockWidget classes.</p>"
@@ -88,7 +88,7 @@ MainWindow::MainWindow(const QMap<QString, QSize> &customSizeHints,
: QMainWindow(parent, flags)
{
setObjectName("MainWindow");
- setWindowTitle("Qt Main Window Demo");
+ setWindowTitle("Qt Main Window Example");
center = new QTextEdit(this);
center->setReadOnly(true);
diff --git a/examples/painting/affine/xform.cpp b/examples/painting/affine/xform.cpp
index ea1916acc8..43f8ce4da1 100644
--- a/examples/painting/affine/xform.cpp
+++ b/examples/painting/affine/xform.cpp
@@ -895,7 +895,7 @@ XFormWidget::XFormWidget(QWidget *parent)
// defaults
view->reset();
vectorType->setChecked(true);
- textEditor->setText("Qt Affine Transformation Demo");
+ textEditor->setText("Qt Affine Transformation Example");
textEditor->setEnabled(false);
animateButton->animateClick();
diff --git a/examples/painting/composition/composition.html b/examples/painting/composition/composition.html
index 1848ad8bd1..82b8991e8f 100644
--- a/examples/painting/composition/composition.html
+++ b/examples/painting/composition/composition.html
@@ -1,9 +1,9 @@
<html>
-<h1>Demo for composition modes</h1>
+<h1>Example for composition modes</h1>
<p>
- This demo shows some of the more advanced composition modes supported by Qt.
+ This example shows some of the more advanced composition modes supported by Qt.
</p>
<p>
diff --git a/examples/richtext/textedit/example.html b/examples/richtext/textedit/example.html
index 6327b5f8fc..cdc8d2a23d 100644
--- a/examples/richtext/textedit/example.html
+++ b/examples/richtext/textedit/example.html
@@ -1,9 +1,9 @@
-<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>QTextEdit Demonstration</title><style type="text/css">
+<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>QTextEdit Example</title><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:20pt; font-weight:600;">QTextEdit</span></p>
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">The QTextEdit widget is an advanced editor that supports formatted rich text. It can be used to display HTML and other rich document formats. Internally, QTextEdit uses the QTextDocument class to describe both the high-level structure of each document and the low-level formatting of paragraphs.</span></p>
-<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">If you are viewing this document in the <span style=" font-style:italic;">textedit</span> demo, you can edit this document to explore Qt's rich text editing features. We have included some comments in each of the following sections to encourage you to experiment. </p>
+<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">If you are viewing this document in the <span style=" font-style:italic;">textedit</span> example, you can edit this document to explore Qt's rich text editing features. We have included some comments in each of the following sections to encourage you to experiment. </p>
<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:18pt; font-weight:600;"><span style=" font-size:16pt;">Font and Paragraph Styles</span></p>
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">QTextEdit supports </span><span style=" font-size:11pt; font-weight:600;">bold</span><span style=" font-size:11pt;">, </span><span style=" font-size:11pt; font-style:italic;">italic</span><span style=" font-size:11pt;">, and </span><span style=" font-size:11pt; text-decoration: underline;">underlined</span><span style=" font-size:11pt;"> font styles, and can display </span><span style=" font-size:11pt; font-weight:600; color:#00007f;">multicolored</span><span style=" font-size:11pt;"> </span><span style=" font-size:11pt; font-weight:600; color:#aa0000;">text</span><span style=" font-size:11pt;">. Font families such as </span><span style=" font-family:'Times'; font-size:11pt; font-weight:600;">Times New Roman</span><span style=" font-size:11pt;"> and </span><span style=" font-family:'Courier'; font-size:11pt; font-weight:600;">Courier</span><span style=" font-size:11pt;"> can also be used directly. </span><span style=" font-size:11pt; font-style:italic;">If you place the cursor in a region of styled text, the controls in the tool bars will change to reflect the current style.</span></p>
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;">Paragraphs can be formatted so that the text is left-aligned, right-aligned, centered, or fully justified.</p>