diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-06-22 12:34:15 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-27 10:59:28 +0200 |
| commit | d15d0b125b11f279ff8a46f32939471fc80f6c38 (patch) | |
| tree | 6dc23222f79ec3fa18c7686a440cacb70e184e0b /examples/painting | |
| parent | 1fda23c0c63e0b445e303c1fd64ecb9d925b6976 (diff) | |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/painting')
| -rw-r--r-- | examples/painting/affine/affine.pro | 10 | ||||
| -rw-r--r-- | examples/painting/painting.pro | 14 | ||||
| -rw-r--r-- | examples/painting/shared/shared.pro | 4 |
3 files changed, 23 insertions, 5 deletions
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 |