From 626283740f9e670a9756e792d36b7cfe6a02cf45 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 21 Nov 2012 14:04:34 +0100 Subject: 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 --- examples/widgets/tutorials/widgets/childwidget/childwidget.pro | 4 ++-- examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro | 4 ++-- examples/widgets/tutorials/widgets/toplevel/toplevel.pro | 4 ++-- examples/widgets/tutorials/widgets/widgets.pro | 4 ++-- examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'examples/widgets/tutorials/widgets') diff --git a/examples/widgets/tutorials/widgets/childwidget/childwidget.pro b/examples/widgets/tutorials/widgets/childwidget/childwidget.pro index eda5ba83a0..c95a2f53cd 100644 --- a/examples/widgets/tutorials/widgets/childwidget/childwidget.pro +++ b/examples/widgets/tutorials/widgets/childwidget/childwidget.pro @@ -1,9 +1,9 @@ SOURCES = main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/childwidget +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/childwidget sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS childwidget.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/childwidget +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/childwidget INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro index 60b9498868..9c7dc95edd 100644 --- a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro +++ b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro @@ -1,9 +1,9 @@ SOURCES = main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/nestedlayouts +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/nestedlayouts sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS nestedlayouts.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/nestedlayouts +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/nestedlayouts INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/widgets/toplevel/toplevel.pro b/examples/widgets/tutorials/widgets/toplevel/toplevel.pro index cbee1b9bab..7bcb4d5491 100644 --- a/examples/widgets/tutorials/widgets/toplevel/toplevel.pro +++ b/examples/widgets/tutorials/widgets/toplevel/toplevel.pro @@ -1,9 +1,9 @@ SOURCES = main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/toplevel +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/toplevel sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS toplevel.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/toplevel +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/toplevel INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/widgets/widgets.pro b/examples/widgets/tutorials/widgets/widgets.pro index 3a6e065ffc..bb83f3f690 100644 --- a/examples/widgets/tutorials/widgets/widgets.pro +++ b/examples/widgets/tutorials/widgets/widgets.pro @@ -2,8 +2,8 @@ TEMPLATE = subdirs SUBDIRS = toplevel childwidget windowlayout nestedlayouts # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS widgets.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro b/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro index 39a32f5f8c..770c34c4ad 100644 --- a/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro +++ b/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro @@ -1,9 +1,9 @@ SOURCES = main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/windowlayout +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/windowlayout sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowlayout.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/widgets/windowlayout +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/windowlayout INSTALLS += target sources QT += widgets -- cgit v1.2.3