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/tools | |
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/tools')
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/tools/echoplugin/plugin/plugin.pro b/examples/tools/echoplugin/plugin/plugin.pro index 308c1b8236..1275fd410b 100644 --- a/examples/tools/echoplugin/plugin/plugin.pro +++ b/examples/tools/echoplugin/plugin/plugin.pro @@ -11,7 +11,7 @@ DESTDIR = ../plugins # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin/plugin -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro echoplugin.json sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin/plugin INSTALLS += target sources diff --git a/examples/tools/plugandpaintplugins/basictools/basictools.pro b/examples/tools/plugandpaintplugins/basictools/basictools.pro index 89023d19cc..f3b197a60f 100644 --- a/examples/tools/plugandpaintplugins/basictools/basictools.pro +++ b/examples/tools/plugandpaintplugins/basictools/basictools.pro @@ -11,7 +11,7 @@ DESTDIR = ../../plugandpaint/plugins # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaint/plugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basictools.pro +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basictools.pro basictools.json sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins/basictools INSTALLS += target sources diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro index 89acbabb23..9df5878416 100644 --- a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro +++ b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro @@ -11,7 +11,7 @@ DESTDIR = ../../plugandpaint/plugins #! [0] # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaint/plugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extrafilters.pro +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extrafilters.pro extrafilters.json sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins/extrafilters INSTALLS += target sources |