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/addressbook-fr/addressbook-fr.pro | 4 ++-- examples/widgets/tutorials/addressbook-fr/part1/part1.pro | 4 ++-- examples/widgets/tutorials/addressbook-fr/part2/part2.pro | 4 ++-- examples/widgets/tutorials/addressbook-fr/part3/part3.pro | 4 ++-- examples/widgets/tutorials/addressbook-fr/part4/part4.pro | 4 ++-- examples/widgets/tutorials/addressbook-fr/part5/part5.pro | 4 ++-- examples/widgets/tutorials/addressbook-fr/part6/part6.pro | 4 ++-- examples/widgets/tutorials/addressbook-fr/part7/part7.pro | 4 ++-- examples/widgets/tutorials/addressbook/addressbook.pro | 4 ++-- examples/widgets/tutorials/addressbook/part1/part1.pro | 4 ++-- examples/widgets/tutorials/addressbook/part2/part2.pro | 4 ++-- examples/widgets/tutorials/addressbook/part3/part3.pro | 4 ++-- examples/widgets/tutorials/addressbook/part4/part4.pro | 4 ++-- examples/widgets/tutorials/addressbook/part5/part5.pro | 4 ++-- examples/widgets/tutorials/addressbook/part6/part6.pro | 4 ++-- examples/widgets/tutorials/addressbook/part7/part7.pro | 4 ++-- examples/widgets/tutorials/gettingStarted/gettingStarted.pro | 9 ++++++++- examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro | 2 +- examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro | 4 ++-- examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro | 4 ++-- examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro | 4 ++-- examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro | 4 ++-- examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro | 4 ++-- examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro | 4 ++-- .../widgets/tutorials/modelview/2_formatting/2_formatting.pro | 4 ++-- .../tutorials/modelview/3_changingmodel/3_changingmodel.pro | 4 ++-- examples/widgets/tutorials/modelview/4_headers/4_headers.pro | 4 ++-- examples/widgets/tutorials/modelview/5_edit/5_edit.pro | 4 ++-- examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro | 4 ++-- .../widgets/tutorials/modelview/7_selections/7_selections.pro | 4 ++-- examples/widgets/tutorials/modelview/modelview.pro | 4 ++-- examples/widgets/tutorials/threads/clock/clock.pro | 4 ++-- .../tutorials/threads/helloconcurrent/helloconcurrent.pro | 4 ++-- examples/widgets/tutorials/threads/hellothread/hellothread.pro | 4 ++-- .../tutorials/threads/hellothreadpool/hellothreadpool.pro | 4 ++-- examples/widgets/tutorials/threads/movedobject/movedobject.pro | 4 ++-- examples/widgets/tutorials/threads/threads.pro | 5 +++++ examples/widgets/tutorials/tutorials.pro | 6 ++++++ examples/widgets/tutorials/widgets/childwidget/childwidget.pro | 4 ++-- .../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 ++-- 43 files changed, 98 insertions(+), 80 deletions(-) (limited to 'examples/widgets/tutorials') diff --git a/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro b/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro index 0ee8387437..6192269e07 100644 --- a/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro +++ b/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro @@ -2,9 +2,9 @@ TEMPLATE = subdirs SUBDIRS = part1 part2 part3 part4 part5 part6 part7 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook-fr +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook-fr.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook-fr +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part1/part1.pro b/examples/widgets/tutorials/addressbook-fr/part1/part1.pro index 4f5067c3e0..305228ea23 100644 --- a/examples/widgets/tutorials/addressbook-fr/part1/part1.pro +++ b/examples/widgets/tutorials/addressbook-fr/part1/part1.pro @@ -5,9 +5,9 @@ HEADERS = addressbook.h QMAKE_PROJECT_NAME = abfr_part1 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/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-fr/part1 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part2/part2.pro b/examples/widgets/tutorials/addressbook-fr/part2/part2.pro index b0a2bc2116..201df064cc 100644 --- a/examples/widgets/tutorials/addressbook-fr/part2/part2.pro +++ b/examples/widgets/tutorials/addressbook-fr/part2/part2.pro @@ -5,9 +5,9 @@ HEADERS = addressbook.h QMAKE_PROJECT_NAME = abfr_part2 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/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-fr/part2 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part3/part3.pro b/examples/widgets/tutorials/addressbook-fr/part3/part3.pro index c5d7656bfa..ee113c0f9c 100644 --- a/examples/widgets/tutorials/addressbook-fr/part3/part3.pro +++ b/examples/widgets/tutorials/addressbook-fr/part3/part3.pro @@ -5,9 +5,9 @@ HEADERS = addressbook.h QMAKE_PROJECT_NAME = abfr_part3 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/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-fr/part3 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part4/part4.pro b/examples/widgets/tutorials/addressbook-fr/part4/part4.pro index 9730887a5d..7055121460 100644 --- a/examples/widgets/tutorials/addressbook-fr/part4/part4.pro +++ b/examples/widgets/tutorials/addressbook-fr/part4/part4.pro @@ -5,9 +5,9 @@ HEADERS = addressbook.h QMAKE_PROJECT_NAME = abfr_part4 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/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-fr/part4 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part5/part5.pro b/examples/widgets/tutorials/addressbook-fr/part5/part5.pro index e9b4887202..2066e93a5b 100644 --- a/examples/widgets/tutorials/addressbook-fr/part5/part5.pro +++ b/examples/widgets/tutorials/addressbook-fr/part5/part5.pro @@ -7,9 +7,9 @@ HEADERS = addressbook.h \ QMAKE_PROJECT_NAME = abfr_part5 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/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-fr/part5 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part6/part6.pro b/examples/widgets/tutorials/addressbook-fr/part6/part6.pro index a95df8d800..6541eb6cfa 100644 --- a/examples/widgets/tutorials/addressbook-fr/part6/part6.pro +++ b/examples/widgets/tutorials/addressbook-fr/part6/part6.pro @@ -7,9 +7,9 @@ HEADERS = addressbook.h \ QMAKE_PROJECT_NAME = abfr_part6 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/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-fr/part6 INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part7/part7.pro b/examples/widgets/tutorials/addressbook-fr/part7/part7.pro index a2cd00dc94..ab1e7ad594 100644 --- a/examples/widgets/tutorials/addressbook-fr/part7/part7.pro +++ b/examples/widgets/tutorials/addressbook-fr/part7/part7.pro @@ -7,9 +7,9 @@ HEADERS = addressbook.h \ QMAKE_PROJECT_NAME = abfr_part7 # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/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-fr/part7 INSTALLS += target sources QT += widgets 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 diff --git a/examples/widgets/tutorials/gettingStarted/gettingStarted.pro b/examples/widgets/tutorials/gettingStarted/gettingStarted.pro index 4ab5f4e6dd..4b1ac2456d 100644 --- a/examples/widgets/tutorials/gettingStarted/gettingStarted.pro +++ b/examples/widgets/tutorials/gettingStarted/gettingStarted.pro @@ -1,3 +1,10 @@ TEMPLATE = subdirs -SUBDIRS += +SUBDIRS += dir_gsqt QT += widgets + +dir_gsqt.file = gsQt/gsqt.pro + +# install +sources.files = gettingStarted.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted +INSTALLS += sources diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro b/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro index 3dac79afce..6866ba9581 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro @@ -8,7 +8,7 @@ SUBDIRS = part1 \ # install sources.files = *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/gettingStarted/gsQt +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt INSTALLS += sources QT += widgets diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro index b3fd65a1f8..199c24b681 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro @@ -3,8 +3,8 @@ QT += widgets SOURCES = main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/gettingStarted/gsQt/part1 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part1 sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tutorial/gettingStarted/gsQt/part1 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part1 INSTALLS += target sources diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro index 81fb0e9ff9..be220d37a3 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro @@ -3,8 +3,8 @@ QT += widgets SOURCES = main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/gettingStarted/gsQt/part2 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part2 sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tutorial/gettingStarted/gsQt/part2 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part2 INSTALLS += target sources diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro index c89f95fbfa..88f1b9817e 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro @@ -3,8 +3,8 @@ QT += widgets SOURCES = main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/gettingStarted/gsQt/part3 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part3 sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tutorial/gettingStarted/gsQt/part3 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part3 INSTALLS += target sources diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro index 94c7abdf39..d88f722111 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro @@ -3,8 +3,8 @@ QT += widgets SOURCES = main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/gettingStarted/gsQt/part4 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part4 sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tutorial/gettingStarted/gsQt/part4 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part4 INSTALLS += target sources diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro index 4631449e71..84fdf940e8 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro @@ -3,8 +3,8 @@ QT += widgets SOURCES = main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/gettingStarted/gsQt/part5 +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part5 sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tutorial/gettingStarted/gsQt/part5 +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part5 INSTALLS += target sources diff --git a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro index d8b496030d..4f2a38d6db 100644 --- a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro +++ b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro @@ -9,9 +9,9 @@ HEADERS += mymodel.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/1_readonly +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/1_readonly sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 1_readonly.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/1_readonly +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/1_readonly INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro index 2b567969de..8032ceedac 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro +++ b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro @@ -8,9 +8,9 @@ SOURCES += main.cpp \ HEADERS += mymodel.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/2_formatting +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/2_formatting sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2_formatting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/2_formatting +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/2_formatting INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro index 2649168f4d..2fb5d25c01 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro +++ b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro @@ -8,9 +8,9 @@ SOURCES += main.cpp \ HEADERS += mymodel.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/3_changingmodel +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/3_changingmodel sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 3_changingmodel.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/3_changingmodel +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/3_changingmodel INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro index 308cb2878c..7ae2eedfda 100644 --- a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro +++ b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro @@ -8,9 +8,9 @@ SOURCES += main.cpp \ HEADERS += mymodel.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/4_headers +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/4_headers sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 4_headers.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/4_headers +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/4_headers INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro index cd55a0b8f4..d67d151dd6 100644 --- a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro +++ b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro @@ -10,9 +10,9 @@ HEADERS += mainwindow.h \ mymodel.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/5_edit +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/5_edit sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 5_edit.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/5_edit +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/5_edit INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro index 21ea5d9552..8ed6cf2b20 100644 --- a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro +++ b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro @@ -5,9 +5,9 @@ SOURCES += main.cpp \ HEADERS += mainwindow.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/6_treeview +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/6_treeview sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 6_treeview.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/6_treeview +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/6_treeview INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro index c1e4b1553d..1865700e78 100644 --- a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro +++ b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro @@ -5,9 +5,9 @@ SOURCES += main.cpp \ HEADERS += mainwindow.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/7_selections +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/7_selections sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 7_selections.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/7_selections +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/7_selections INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/modelview/modelview.pro b/examples/widgets/tutorials/modelview/modelview.pro index 4a7e4a344e..c335d185e2 100644 --- a/examples/widgets/tutorials/modelview/modelview.pro +++ b/examples/widgets/tutorials/modelview/modelview.pro @@ -8,9 +8,9 @@ SUBDIRS = 1_readonly \ 7_selections # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS modelview.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/threads/clock/clock.pro b/examples/widgets/tutorials/threads/clock/clock.pro index b07c84a627..973836d468 100644 --- a/examples/widgets/tutorials/threads/clock/clock.pro +++ b/examples/widgets/tutorials/threads/clock/clock.pro @@ -5,9 +5,9 @@ SOURCES += main.cpp \ HEADERS += clockthread.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/clock +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/clock sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS clock.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/clock +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/clock INSTALLS += target sources diff --git a/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro b/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro index 1941666755..b6e87acf88 100644 --- a/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro +++ b/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro @@ -7,9 +7,9 @@ TEMPLATE = app SOURCES += helloconcurrent.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/helloconcurrent +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/helloconcurrent sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloconcurrent.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/helloconcurrent +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/helloconcurrent INSTALLS += target sources diff --git a/examples/widgets/tutorials/threads/hellothread/hellothread.pro b/examples/widgets/tutorials/threads/hellothread/hellothread.pro index 877bb10c39..291dbf156d 100644 --- a/examples/widgets/tutorials/threads/hellothread/hellothread.pro +++ b/examples/widgets/tutorials/threads/hellothread/hellothread.pro @@ -8,9 +8,9 @@ SOURCES += main.cpp \ HEADERS += hellothread.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/hellothread +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothread sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothread.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/hellothread +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothread INSTALLS += target sources diff --git a/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro b/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro index 8539f38f45..c9afbe0265 100644 --- a/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro +++ b/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro @@ -6,9 +6,9 @@ TEMPLATE = app SOURCES += hellothreadpool.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/hellothreadpool +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothreadpool sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothreadpool.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/hellothreadpool +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothreadpool INSTALLS += target sources diff --git a/examples/widgets/tutorials/threads/movedobject/movedobject.pro b/examples/widgets/tutorials/threads/movedobject/movedobject.pro index c7fd608c7e..384c3528f6 100644 --- a/examples/widgets/tutorials/threads/movedobject/movedobject.pro +++ b/examples/widgets/tutorials/threads/movedobject/movedobject.pro @@ -10,9 +10,9 @@ HEADERS += \ thread.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/movedobject +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/movedobject sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS movedobject.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/movedobject +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/movedobject INSTALLS += target sources QT += widgets diff --git a/examples/widgets/tutorials/threads/threads.pro b/examples/widgets/tutorials/threads/threads.pro index a95eccaaa0..f7bd4df0e8 100644 --- a/examples/widgets/tutorials/threads/threads.pro +++ b/examples/widgets/tutorials/threads/threads.pro @@ -8,3 +8,8 @@ SUBDIRS = hellothread \ contains(QT_CONFIG, concurrent): SUBDIRS += helloconcurrent QT += widgets + +# install +sources.files = threads.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads +INSTALLS += sources diff --git a/examples/widgets/tutorials/tutorials.pro b/examples/widgets/tutorials/tutorials.pro index cb57002082..3a7cf8f9d6 100644 --- a/examples/widgets/tutorials/tutorials.pro +++ b/examples/widgets/tutorials/tutorials.pro @@ -1,2 +1,8 @@ TEMPLATE = subdirs SUBDIRS += addressbook-fr threads addressbook widgets modelview gettingStarted + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials +sources.files = tutorials.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials +INSTALLS += target sources 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