From d15d0b125b11f279ff8a46f32939471fc80f6c38 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Wed, 22 Jun 2011 12:34:15 +0200 Subject: Add the shared painting and affine example to the build. Change-Id: I85e66c9a33a1c908b7588beb219cc9540698ab68 Reviewed-on: http://codereview.qt.nokia.com/623 Reviewed-by: Qt Sanity Bot Reviewed-by: Casper van Donderen --- examples/painting/affine/affine.pro | 10 +++++++--- examples/painting/painting.pro | 14 ++++++++++++++ examples/painting/shared/shared.pro | 4 ++-- 3 files changed, 23 insertions(+), 5 deletions(-) (limited to 'examples/painting') diff --git a/examples/painting/affine/affine.pro b/examples/painting/affine/affine.pro index a3d6e30ad1..817e5829c2 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/painting.pro b/examples/painting/painting.pro index 41f91822c4..1a0bda780b 100644 --- a/examples/painting/painting.pro +++ b/examples/painting/painting.pro @@ -1,6 +1,8 @@ TEMPLATE = subdirs SUBDIRS = basicdrawing \ concentriccircles \ + examples_affine \ + painting_shared \ imagecomposition \ painterpaths \ transformations \ @@ -14,3 +16,15 @@ INSTALLS += target sources symbian: CONFIG += qt_example maemo5: CONFIG += qt_example + +examples_affine.subdir = affine +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_arthurplugin.depends = painting_shared + examples_pathstroke.depends = painting_shared +} diff --git a/examples/painting/shared/shared.pro b/examples/painting/shared/shared.pro index 88d7fbedab..e996956880 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 -- cgit v1.2.3 From 89459bc7cf6326bd68f395f1c3e774c1a4b598b6 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Thu, 23 Jun 2011 16:46:25 +0200 Subject: Add the painting demos-examples to build. Change-Id: Ia6f23719af0ec3091573909b5666ec795ee22410 Reviewed-on: http://codereview.qt.nokia.com/685 Reviewed-by: Qt Sanity Bot Reviewed-by: Casper van Donderen --- examples/painting/composition/composition.pro | 6 +++--- examples/painting/deform/deform.pro | 6 +++--- examples/painting/gradients/gradients.pro | 6 +++--- examples/painting/painting.pro | 9 ++++++++- examples/painting/pathstroke/pathstroke.pro | 6 +++--- 5 files changed, 20 insertions(+), 13 deletions(-) (limited to 'examples/painting') diff --git a/examples/painting/composition/composition.pro b/examples/painting/composition/composition.pro index 59b91126b9..3a552955b4 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 3393b8e83c..673b2e8288 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 ed4120e01c..22a4baac9e 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 1a0bda780b..33d9e354ba 100644 --- a/examples/painting/painting.pro +++ b/examples/painting/painting.pro @@ -2,6 +2,10 @@ TEMPLATE = subdirs SUBDIRS = basicdrawing \ concentriccircles \ examples_affine \ + examples_composition \ + examples_deform \ + examples_gradients \ + examples_pathstroke \ painting_shared \ imagecomposition \ painterpaths \ @@ -18,6 +22,10 @@ symbian: CONFIG += qt_example 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 { @@ -25,6 +33,5 @@ painting_shared.subdir = shared examples_deform.depends = painting_shared examples_gradients.depends = painting_shared examples_composition.depends = painting_shared - examples_arthurplugin.depends = painting_shared examples_pathstroke.depends = painting_shared } diff --git a/examples/painting/pathstroke/pathstroke.pro b/examples/painting/pathstroke/pathstroke.pro index 9bbf8a6f77..1d1efdc342 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 } -- cgit v1.2.3 From 192eae5797fdd8b68eef8697fd75717fd537d15b Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 4 Jul 2011 10:16:53 +0200 Subject: Remove references to demos from docs. Change-Id: I1ae723af883c305ea64a4e46cc3ce889dd3c021b Reviewed-on: http://codereview.qt.nokia.com/1032 Reviewed-by: Qt Sanity Bot Reviewed-by: David Boddie --- examples/painting/README | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'examples/painting') 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. -- cgit v1.2.3