diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-21 14:04:34 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 16:36:50 +0100 |
commit | 626283740f9e670a9756e792d36b7cfe6a02cf45 (patch) | |
tree | 1abb9662ce38bf42b6adb2a5903bdca50c0d0362 /examples/widgets/painting | |
parent | 23e44afe7a27a385f430fbae9ce4948a44b93bce (diff) |
Fix building of examples.
- Correct install path of widget examples to contain widgets
directory in target tree.
- Add missing resources.
Task-number: QTBUG-27977
Change-Id: If4cb117998892b0b165d7678367553d3a7553b91
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'examples/widgets/painting')
13 files changed, 26 insertions, 26 deletions
diff --git a/examples/widgets/painting/affine/affine.pro b/examples/widgets/painting/affine/affine.pro index 0977ea1c5b..5a5e46f12f 100644 --- a/examples/widgets/painting/affine/affine.pro +++ b/examples/widgets/painting/affine/affine.pro @@ -14,9 +14,9 @@ include($$SHARED_FOLDER/shared.pri) RESOURCES += affine.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/affine sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/affine INSTALLS += target sources wince*: { diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.pro b/examples/widgets/painting/basicdrawing/basicdrawing.pro index 0e0328e61f..fba796509c 100644 --- a/examples/widgets/painting/basicdrawing/basicdrawing.pro +++ b/examples/widgets/painting/basicdrawing/basicdrawing.pro @@ -6,9 +6,9 @@ SOURCES = main.cpp \ RESOURCES = basicdrawing.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/basicdrawing +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/basicdrawing sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basicdrawing.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/basicdrawing +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/basicdrawing INSTALLS += target sources QT += widgets diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro index eb63d0c47a..0594cc0be3 100644 --- a/examples/widgets/painting/composition/composition.pro +++ b/examples/widgets/painting/composition/composition.pro @@ -13,9 +13,9 @@ contains(QT_CONFIG, opengl) { QT += widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/composition sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/composition INSTALLS += target sources diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.pro b/examples/widgets/painting/concentriccircles/concentriccircles.pro index 0f87b991ed..dc40531565 100644 --- a/examples/widgets/painting/concentriccircles/concentriccircles.pro +++ b/examples/widgets/painting/concentriccircles/concentriccircles.pro @@ -5,9 +5,9 @@ SOURCES = circlewidget.cpp \ window.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/concentriccircles +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/concentriccircles sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS concentriccircles.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/concentriccircles +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/concentriccircles INSTALLS += target sources QT += widgets diff --git a/examples/widgets/painting/deform/deform.pro b/examples/widgets/painting/deform/deform.pro index 527133e7e5..a420ea941a 100644 --- a/examples/widgets/painting/deform/deform.pro +++ b/examples/widgets/painting/deform/deform.pro @@ -14,7 +14,7 @@ contains(QT_CONFIG, opengl) { QT += widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/deform sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/deform INSTALLS += target sources diff --git a/examples/widgets/painting/fontsampler/fontsampler.pro b/examples/widgets/painting/fontsampler/fontsampler.pro index b918c51837..8cf2bf71fd 100644 --- a/examples/widgets/painting/fontsampler/fontsampler.pro +++ b/examples/widgets/painting/fontsampler/fontsampler.pro @@ -4,9 +4,9 @@ SOURCES = main.cpp \ mainwindow.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/fontsampler sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/fontsampler INSTALLS += target sources QT += widgets diff --git a/examples/widgets/painting/gradients/gradients.pro b/examples/widgets/painting/gradients/gradients.pro index 4362d283ee..e1baeeb466 100644 --- a/examples/widgets/painting/gradients/gradients.pro +++ b/examples/widgets/painting/gradients/gradients.pro @@ -13,8 +13,8 @@ contains(QT_CONFIG, opengl) { QT += widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/gradients sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/gradients INSTALLS += target sources diff --git a/examples/widgets/painting/imagecomposition/imagecomposition.pro b/examples/widgets/painting/imagecomposition/imagecomposition.pro index edf434f5d2..877270f5a8 100644 --- a/examples/widgets/painting/imagecomposition/imagecomposition.pro +++ b/examples/widgets/painting/imagecomposition/imagecomposition.pro @@ -4,9 +4,9 @@ SOURCES = imagecomposer.cpp \ RESOURCES = imagecomposition.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/imagecomposition +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/imagecomposition sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/imagecomposition +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/imagecomposition INSTALLS += target sources QT += widgets diff --git a/examples/widgets/painting/painterpaths/painterpaths.pro b/examples/widgets/painting/painterpaths/painterpaths.pro index c988ba26e0..3e5006f509 100644 --- a/examples/widgets/painting/painterpaths/painterpaths.pro +++ b/examples/widgets/painting/painterpaths/painterpaths.pro @@ -6,9 +6,9 @@ SOURCES = main.cpp \ unix:!mac:!vxworks:!integrity:LIBS += -lm # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/painterpaths +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/painterpaths sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painterpaths.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/painterpaths +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/painterpaths INSTALLS += target sources QT += widgets diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro index 927d94006b..2fac6507e7 100644 --- a/examples/widgets/painting/painting.pro +++ b/examples/widgets/painting/painting.pro @@ -13,9 +13,9 @@ SUBDIRS = basicdrawing \ fontsampler # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting INSTALLS += target sources QT += widgets diff --git a/examples/widgets/painting/pathstroke/pathstroke.pro b/examples/widgets/painting/pathstroke/pathstroke.pro index 916866d1f2..ce5884fff7 100644 --- a/examples/widgets/painting/pathstroke/pathstroke.pro +++ b/examples/widgets/painting/pathstroke/pathstroke.pro @@ -14,8 +14,8 @@ contains(QT_CONFIG, opengl) { QT += widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/pathstroke sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/pathstroke INSTALLS += target sources diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro index 212f3a20d7..a22bf608bd 100644 --- a/examples/widgets/painting/shared/shared.pro +++ b/examples/widgets/painting/shared/shared.pro @@ -26,9 +26,9 @@ HEADERS += \ RESOURCES += shared.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/shared sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/shared INSTALLS += sources !cross_compile:INSTALLS += target diff --git a/examples/widgets/painting/transformations/transformations.pro b/examples/widgets/painting/transformations/transformations.pro index a261c53371..665811d3c8 100644 --- a/examples/widgets/painting/transformations/transformations.pro +++ b/examples/widgets/painting/transformations/transformations.pro @@ -5,9 +5,9 @@ SOURCES = main.cpp \ window.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/transformations +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/transformations sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/transformations +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/transformations INSTALLS += target sources QT += widgets |