Examples: Install to $$[QT_INSTALL_EXAMPLES]/$submodule/$example

This makes the structure of the examples after an 'make install'
similar to the one in a 'developer build'.

Change-Id: I9120bd741fab332e64e30adc01cefe87e5633454
Reviewed-by: Martin Smith <martin.smith@digia.com>

43 files changed, 83 insertions, 83 deletions

diff --git a/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro b/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro
index 6192269e07..8db6a819a8 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/widgets/tutorials/addressbook-fr
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook-fr.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 305228ea23..08a870a77e 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/widgets/tutorials/addressbook-fr/part1
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part1
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part1
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 201df064cc..34408264c2 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/widgets/tutorials/addressbook-fr/part2
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part2
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ee113c0f9c..a2fb6c5fca 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/widgets/tutorials/addressbook-fr/part3
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part3
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part3
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 7055121460..68705fc807 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/widgets/tutorials/addressbook-fr/part4
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part4
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part4
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 2066e93a5b..fcaf3fc66f 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/widgets/tutorials/addressbook-fr/part5
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part5
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part5
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 6541eb6cfa..34bcb8f8fc 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/widgets/tutorials/addressbook-fr/part6
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part6
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part6
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ab1e7ad594..e0981a7da9 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/widgets/tutorials/addressbook-fr/part7
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part7
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part7
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 4e26f48af9..80bc073e71 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/widgets/tutorials/addressbook
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 c44a048797..e8722df318 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/widgets/tutorials/addressbook/part1
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part1
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part1
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ae95f6fab7..65247f3e61 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/widgets/tutorials/addressbook/part2
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part2
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 6809a9e27a..79cf2da551 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/widgets/tutorials/addressbook/part3
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part3
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part3
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 82b2624069..61ceb90802 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/widgets/tutorials/addressbook/part4
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part4
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part4
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 b12fcac50a..8f42a07025 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/widgets/tutorials/addressbook/part5
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part5
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part5
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 91672e7bfa..f7a958cf97 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/widgets/tutorials/addressbook/part6
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part6
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part6
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 fcb5c37060..90fc0ca229 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/widgets/tutorials/addressbook/part7
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part7
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part7
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 4b1ac2456d..98a834f5f6 100644
--- a/examples/widgets/tutorials/gettingStarted/gettingStarted.pro
+++ b/examples/widgets/tutorials/gettingStarted/gettingStarted.pro
@@ -6,5 +6,5 @@ dir_gsqt.file = gsQt/gsqt.pro
 
 # install
 sources.files = gettingStarted.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted
 INSTALLS += sources
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro b/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro
index 6866ba9581..4a0604fc3f 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/widgets/tutorials/gettingStarted/gsQt
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 199c24b681..e6eb0d45f2 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]/qtbase/widgets/tutorials/gettingStarted/gsQt/part1
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part1
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part1
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 be220d37a3..c3f30e5810 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]/qtbase/widgets/tutorials/gettingStarted/gsQt/part2
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part2
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part2
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 88f1b9817e..f51e531cbd 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]/qtbase/widgets/tutorials/gettingStarted/gsQt/part3
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part3
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part3
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 d88f722111..5221bda09d 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]/qtbase/widgets/tutorials/gettingStarted/gsQt/part4
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part4
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part4
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 84fdf940e8..a3687aa4b2 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]/qtbase/widgets/tutorials/gettingStarted/gsQt/part5
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part5
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part5
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 4f2a38d6db..4aa8ed1039 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/widgets/tutorials/modelview/1_readonly
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/1_readonly
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 1_readonly.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/1_readonly
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 8032ceedac..668b2570cf 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/widgets/tutorials/modelview/2_formatting
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/2_formatting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2_formatting.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/2_formatting
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 2fb5d25c01..8993d7149b 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/widgets/tutorials/modelview/3_changingmodel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/3_changingmodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 3_changingmodel.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/3_changingmodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 7ae2eedfda..a343b63fdb 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/widgets/tutorials/modelview/4_headers
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/4_headers
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 4_headers.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/4_headers
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 d67d151dd6..cea272439e 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/widgets/tutorials/modelview/5_edit
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/5_edit
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 5_edit.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/5_edit
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 8ed6cf2b20..1e35d6cd67 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/widgets/tutorials/modelview/6_treeview
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/6_treeview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 6_treeview.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/6_treeview
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 1865700e78..f3eaac0a7d 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/widgets/tutorials/modelview/7_selections
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/7_selections
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 7_selections.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/7_selections
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 c335d185e2..2d6460fc4d 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/widgets/tutorials/modelview
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS modelview.pro 
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 973836d468..833781b36a 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/widgets/tutorials/threads/clock
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/clock
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS clock.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/clock
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 b6e87acf88..794c095aa0 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/widgets/tutorials/threads/helloconcurrent
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/helloconcurrent
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloconcurrent.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/helloconcurrent
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 291dbf156d..8bc14d09c3 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/widgets/tutorials/threads/hellothread
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothread
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothread.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothread
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 c9afbe0265..6e60fd14bc 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/widgets/tutorials/threads/hellothreadpool
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothreadpool
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothreadpool.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothreadpool
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 384c3528f6..5037b37369 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/widgets/tutorials/threads/movedobject
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/movedobject
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS movedobject.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/movedobject
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 f7bd4df0e8..fd26fae6f7 100644
--- a/examples/widgets/tutorials/threads/threads.pro
+++ b/examples/widgets/tutorials/threads/threads.pro
@@ -11,5 +11,5 @@ QT += widgets
 
 # install
 sources.files = threads.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads
 INSTALLS += sources
diff --git a/examples/widgets/tutorials/tutorials.pro b/examples/widgets/tutorials/tutorials.pro
index 3a7cf8f9d6..144dffa631 100644
--- a/examples/widgets/tutorials/tutorials.pro
+++ b/examples/widgets/tutorials/tutorials.pro
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
 SUBDIRS +=  addressbook-fr threads addressbook widgets modelview gettingStarted
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials
 sources.files = tutorials.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials
 INSTALLS += target sources
diff --git a/examples/widgets/tutorials/widgets/childwidget/childwidget.pro b/examples/widgets/tutorials/widgets/childwidget/childwidget.pro
index c95a2f53cd..6f04e9582e 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/widgets/tutorials/widgets/childwidget
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/childwidget
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS childwidget.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/childwidget
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 9c7dc95edd..2655559435 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/widgets/tutorials/widgets/nestedlayouts
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/nestedlayouts
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS nestedlayouts.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/nestedlayouts
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 7bcb4d5491..fd2506612c 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/widgets/tutorials/widgets/toplevel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/toplevel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS toplevel.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/toplevel
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 bb83f3f690..318453e5a7 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/widgets/tutorials/widgets
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS widgets.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 770c34c4ad..d87f7780f1 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/widgets/tutorials/widgets/windowlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/windowlayout
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowlayout.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/windowlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/windowlayout
 INSTALLS += target sources
 QT += widgets