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/tutorials/addressbook | |
| 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/tutorials/addressbook')
8 files changed, 16 insertions, 16 deletions
diff --git a/examples/widgets/tutorials/addressbook/addressbook.pro b/examples/widgets/tutorials/addressbook/addressbook.pro index 51438698da..4e26f48af9 100644 --- a/examples/widgets/tutorials/addressbook/addressbook.pro +++ b/examples/widgets/tutorials/addressbook/addressbook.pro @@ -2,9 +2,9 @@ TEMPLATE = subdirs SUBDIRS = part1 part2 part3 part4 part5 part6 part7 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part1/part1.pro b/examples/widgets/tutorials/addressbook/part1/part1.pro index 44b98982f9..c44a048797 100644 --- a/examples/widgets/tutorials/addressbook/part1/part1.pro +++ b/examples/widgets/tutorials/addressbook/part1/part1.pro @@ -5,9 +5,9 @@ HEADERS = addressbook.h QMAKE_PROJECT_NAME = ab_part1 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part1 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part1 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part2/part2.pro b/examples/widgets/tutorials/addressbook/part2/part2.pro index 69f7928de2..ae95f6fab7 100644 --- a/examples/widgets/tutorials/addressbook/part2/part2.pro +++ b/examples/widgets/tutorials/addressbook/part2/part2.pro @@ -5,9 +5,9 @@ HEADERS = addressbook.h QMAKE_PROJECT_NAME = ab_part2 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part2 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part2 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part3/part3.pro b/examples/widgets/tutorials/addressbook/part3/part3.pro index 9d46632089..6809a9e27a 100644 --- a/examples/widgets/tutorials/addressbook/part3/part3.pro +++ b/examples/widgets/tutorials/addressbook/part3/part3.pro @@ -5,9 +5,9 @@ HEADERS = addressbook.h QMAKE_PROJECT_NAME = ab_part3 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part3 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part3 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part4/part4.pro b/examples/widgets/tutorials/addressbook/part4/part4.pro index eab04eef09..82b2624069 100644 --- a/examples/widgets/tutorials/addressbook/part4/part4.pro +++ b/examples/widgets/tutorials/addressbook/part4/part4.pro @@ -5,9 +5,9 @@ HEADERS = addressbook.h QMAKE_PROJECT_NAME = ab_part4 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part4 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part4 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part5/part5.pro b/examples/widgets/tutorials/addressbook/part5/part5.pro index 691e56b914..b12fcac50a 100644 --- a/examples/widgets/tutorials/addressbook/part5/part5.pro +++ b/examples/widgets/tutorials/addressbook/part5/part5.pro @@ -7,9 +7,9 @@ HEADERS = addressbook.h \ QMAKE_PROJECT_NAME = ab_part5 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part5 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part5 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part6/part6.pro b/examples/widgets/tutorials/addressbook/part6/part6.pro index d218280467..91672e7bfa 100644 --- a/examples/widgets/tutorials/addressbook/part6/part6.pro +++ b/examples/widgets/tutorials/addressbook/part6/part6.pro @@ -7,9 +7,9 @@ HEADERS = addressbook.h \ QMAKE_PROJECT_NAME = ab_part6 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part6 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part6 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part7/part7.pro b/examples/widgets/tutorials/addressbook/part7/part7.pro index 8120816441..fcb5c37060 100644 --- a/examples/widgets/tutorials/addressbook/part7/part7.pro +++ b/examples/widgets/tutorials/addressbook/part7/part7.pro @@ -7,9 +7,9 @@ HEADERS = addressbook.h \ QMAKE_PROJECT_NAME = ab_part7 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part7 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part7 INSTALLS += target sources QT += widgets |