diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-21 15:25:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 16:50:23 +0100 |
| commit | e886cc7b24e920d85b239e05911e5dbd5d5f29f3 (patch) | |
| tree | 2d2e104bde9d57d32daeaf45efd4080168a9bff7 /examples/svg | |
| parent | 7ab53653c5e0c0282873569ff1324ac20478332b (diff) | |
| download | qtsvg-e886cc7b24e920d85b239e05911e5dbd5d5f29f3.tar.gz | |
Fix building of installed examples.
- Correct install paths
- Add missing resources.
Task-number: QTBUG-27977
Change-Id: Ie31cc31a208393dd8dfce87b067b81d986dc946e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'examples/svg')
| -rw-r--r-- | examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro | 4 | ||||
| -rw-r--r-- | examples/svg/svg.pro | 5 | ||||
| -rw-r--r-- | examples/svg/svggenerator/svggenerator.pro | 6 | ||||
| -rw-r--r-- | examples/svg/svgviewer/svgviewer.pro | 4 |
4 files changed, 11 insertions, 8 deletions
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro index c48a317..2445f96 100644 --- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro +++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro @@ -5,9 +5,9 @@ HEADERS += embeddedsvgviewer.h SOURCES += embeddedsvgviewer.cpp main.cpp RESOURCES += embeddedsvgviewer.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/embeddedsvgviewer +target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/embeddedsvgviewer sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/embeddedsvgviewer +sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/embeddedsvgviewer INSTALLS += target sources wince* { diff --git a/examples/svg/svg.pro b/examples/svg/svg.pro index 1652275..fdadc81 100644 --- a/examples/svg/svg.pro +++ b/examples/svg/svg.pro @@ -4,4 +4,7 @@ TEMPLATE = subdirs QT+=widgets - +# install +sources.files = svg.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg +INSTALLS += sources diff --git a/examples/svg/svggenerator/svggenerator.pro b/examples/svg/svggenerator/svggenerator.pro index 4e62b22..6945418 100644 --- a/examples/svg/svggenerator/svggenerator.pro +++ b/examples/svg/svggenerator/svggenerator.pro @@ -11,9 +11,9 @@ QT += svg INCLUDEPATH += $$PWD # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/painting/svggenerator -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS svggenerator.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/painting/svggenerator +target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svggenerator +sources.files = $$SOURCES $$HEADERS $$RESOURCES forms doc resources svggenerator.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svggenerator INSTALLS += target sources QT+=widgets diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro index 94daed9..9614741 100644 --- a/examples/svg/svgviewer/svgviewer.pro +++ b/examples/svg/svgviewer/svgviewer.pro @@ -11,9 +11,9 @@ contains(QT_CONFIG, opengl): QT += opengl CONFIG += console # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/painting/svgviewer +target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer sources.files = $$SOURCES $$HEADERS $$RESOURCES svgviewer.pro files -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/painting/svgviewer +sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer INSTALLS += target sources wince*: { |