diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
| commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
| tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /examples/richtext | |
| parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
| parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (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/richtext')
| -rw-r--r-- | examples/richtext/README | 33 | ||||
| -rw-r--r-- | examples/richtext/richtext.pro | 3 | ||||
| -rw-r--r-- | examples/richtext/textedit/textedit.pro | 8 |
3 files changed, 7 insertions, 37 deletions
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 |