summaryrefslogtreecommitdiffstats
path: root/examples/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'examples/widgets')
-rw-r--r--examples/widgets/animation/animatedtiles/animatedtiles.pro4
-rw-r--r--examples/widgets/animation/animation.pro4
-rw-r--r--examples/widgets/animation/appchooser/appchooser.pro6
-rw-r--r--examples/widgets/animation/easing/easing.pro4
-rw-r--r--examples/widgets/animation/moveblocks/moveblocks.pro4
-rw-r--r--examples/widgets/animation/states/states.pro6
-rw-r--r--examples/widgets/animation/stickman/stickman.pro6
-rw-r--r--examples/widgets/animation/sub-attaq/sub-attaq.pro7
-rw-r--r--examples/widgets/desktop/desktop.pro4
-rw-r--r--examples/widgets/desktop/screenshot/screenshot.pro4
-rw-r--r--examples/widgets/desktop/systray/systray.pro6
-rw-r--r--examples/widgets/dialogs/classwizard/classwizard.pro4
-rw-r--r--examples/widgets/dialogs/configdialog/configdialog.pro4
-rw-r--r--examples/widgets/dialogs/dialogs.pro2
-rw-r--r--examples/widgets/dialogs/extension/extension.pro4
-rw-r--r--examples/widgets/dialogs/findfiles/findfiles.pro4
-rw-r--r--examples/widgets/dialogs/licensewizard/licensewizard.pro4
-rw-r--r--examples/widgets/dialogs/sipdialog/sipdialog.pro4
-rw-r--r--examples/widgets/dialogs/standarddialogs/standarddialogs.pro4
-rw-r--r--examples/widgets/dialogs/tabdialog/tabdialog.pro4
-rw-r--r--examples/widgets/dialogs/trivialwizard/trivialwizard.pro4
-rw-r--r--examples/widgets/draganddrop/draganddrop.pro2
-rw-r--r--examples/widgets/draganddrop/draggableicons/draggableicons.pro4
-rw-r--r--examples/widgets/draganddrop/draggabletext/draggabletext.pro4
-rw-r--r--examples/widgets/draganddrop/dropsite/dropsite.pro4
-rw-r--r--examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro4
-rw-r--r--examples/widgets/draganddrop/puzzle/puzzle.pro4
-rw-r--r--examples/widgets/effects/blurpicker/blurpicker.pro6
-rw-r--r--examples/widgets/effects/effects.pro4
-rw-r--r--examples/widgets/effects/fademessage/fademessage.pro4
-rw-r--r--examples/widgets/effects/lighting/lighting.pro4
-rw-r--r--examples/widgets/graphicsview/anchorlayout/anchorlayout.pro4
-rw-r--r--examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro6
-rw-r--r--examples/widgets/graphicsview/boxes/boxes.pro4
-rw-r--r--examples/widgets/graphicsview/chip/chip.pro4
-rw-r--r--examples/widgets/graphicsview/collidingmice/collidingmice.pro4
-rw-r--r--examples/widgets/graphicsview/diagramscene/diagramscene.pro4
-rw-r--r--examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro4
-rw-r--r--examples/widgets/graphicsview/elasticnodes/elasticnodes.pro4
-rw-r--r--examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro4
-rw-r--r--examples/widgets/graphicsview/flowlayout/flowlayout.pro4
-rw-r--r--examples/widgets/graphicsview/graphicsview.pro4
-rw-r--r--examples/widgets/graphicsview/padnavigator/padnavigator.pro4
-rw-r--r--examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro4
-rw-r--r--examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro4
-rw-r--r--examples/widgets/itemviews/addressbook/addressbook.pro4
-rw-r--r--examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro4
-rw-r--r--examples/widgets/itemviews/chart/chart.pro4
-rw-r--r--examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro4
-rw-r--r--examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro4
-rw-r--r--examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro4
-rw-r--r--examples/widgets/itemviews/dirview/dirview.pro4
-rw-r--r--examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro4
-rw-r--r--examples/widgets/itemviews/fetchmore/fetchmore.pro4
-rw-r--r--examples/widgets/itemviews/frozencolumn/frozencolumn.pro6
-rw-r--r--examples/widgets/itemviews/interview/interview.pro4
-rw-r--r--examples/widgets/itemviews/itemviews.pro2
-rw-r--r--examples/widgets/itemviews/pixelator/pixelator.pro4
-rw-r--r--examples/widgets/itemviews/puzzle/puzzle.pro4
-rw-r--r--examples/widgets/itemviews/simpledommodel/simpledommodel.pro4
-rw-r--r--examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro4
-rw-r--r--examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro4
-rw-r--r--examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro4
-rw-r--r--examples/widgets/itemviews/spreadsheet/spreadsheet.pro4
-rw-r--r--examples/widgets/itemviews/stardelegate/stardelegate.pro4
-rw-r--r--examples/widgets/layouts/basiclayouts/basiclayouts.pro4
-rw-r--r--examples/widgets/layouts/borderlayout/borderlayout.pro4
-rw-r--r--examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro4
-rw-r--r--examples/widgets/layouts/flowlayout/flowlayout.pro4
-rw-r--r--examples/widgets/layouts/layouts.pro2
-rw-r--r--examples/widgets/mainwindows/application/application.pro4
-rw-r--r--examples/widgets/mainwindows/dockwidgets/dockwidgets.pro4
-rw-r--r--examples/widgets/mainwindows/mainwindow/mainwindow.pro4
-rw-r--r--examples/widgets/mainwindows/mainwindows.pro4
-rw-r--r--examples/widgets/mainwindows/mdi/mdi.pro4
-rw-r--r--examples/widgets/mainwindows/menus/menus.pro4
-rw-r--r--examples/widgets/mainwindows/recentfiles/recentfiles.pro4
-rw-r--r--examples/widgets/mainwindows/sdi/sdi.pro4
-rw-r--r--examples/widgets/painting/affine/affine.pro4
-rw-r--r--examples/widgets/painting/basicdrawing/basicdrawing.pro4
-rw-r--r--examples/widgets/painting/composition/composition.pro4
-rw-r--r--examples/widgets/painting/concentriccircles/concentriccircles.pro4
-rw-r--r--examples/widgets/painting/deform/deform.pro4
-rw-r--r--examples/widgets/painting/fontsampler/fontsampler.pro4
-rw-r--r--examples/widgets/painting/gradients/gradients.pro4
-rw-r--r--examples/widgets/painting/imagecomposition/imagecomposition.pro4
-rw-r--r--examples/widgets/painting/painterpaths/painterpaths.pro4
-rw-r--r--examples/widgets/painting/painting.pro4
-rw-r--r--examples/widgets/painting/pathstroke/pathstroke.pro4
-rw-r--r--examples/widgets/painting/shared/shared.pro4
-rw-r--r--examples/widgets/painting/transformations/transformations.pro4
-rw-r--r--examples/widgets/richtext/calendar/calendar.pro4
-rw-r--r--examples/widgets/richtext/orderform/orderform.pro4
-rw-r--r--examples/widgets/richtext/richtext.pro4
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro4
-rw-r--r--examples/widgets/richtext/textedit/textedit.pro4
-rw-r--r--examples/widgets/scroller/graphicsview/graphicsview.pro4
-rw-r--r--examples/widgets/scroller/scroller.pro5
-rw-r--r--examples/widgets/statemachine/eventtransitions/eventtransitions.pro4
-rw-r--r--examples/widgets/statemachine/factorial/factorial.pro4
-rw-r--r--examples/widgets/statemachine/pingpong/pingpong.pro4
-rw-r--r--examples/widgets/statemachine/rogue/rogue.pro4
-rw-r--r--examples/widgets/statemachine/statemachine.pro4
-rw-r--r--examples/widgets/statemachine/trafficlight/trafficlight.pro4
-rw-r--r--examples/widgets/statemachine/twowaybutton/twowaybutton.pro4
-rw-r--r--examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro4
-rw-r--r--examples/widgets/tutorials/addressbook-fr/part1/part1.pro4
-rw-r--r--examples/widgets/tutorials/addressbook-fr/part2/part2.pro4
-rw-r--r--examples/widgets/tutorials/addressbook-fr/part3/part3.pro4
-rw-r--r--examples/widgets/tutorials/addressbook-fr/part4/part4.pro4
-rw-r--r--examples/widgets/tutorials/addressbook-fr/part5/part5.pro4
-rw-r--r--examples/widgets/tutorials/addressbook-fr/part6/part6.pro4
-rw-r--r--examples/widgets/tutorials/addressbook-fr/part7/part7.pro4
-rw-r--r--examples/widgets/tutorials/addressbook/addressbook.pro4
-rw-r--r--examples/widgets/tutorials/addressbook/part1/part1.pro4
-rw-r--r--examples/widgets/tutorials/addressbook/part2/part2.pro4
-rw-r--r--examples/widgets/tutorials/addressbook/part3/part3.pro4
-rw-r--r--examples/widgets/tutorials/addressbook/part4/part4.pro4
-rw-r--r--examples/widgets/tutorials/addressbook/part5/part5.pro4
-rw-r--r--examples/widgets/tutorials/addressbook/part6/part6.pro4
-rw-r--r--examples/widgets/tutorials/addressbook/part7/part7.pro4
-rw-r--r--examples/widgets/tutorials/gettingStarted/gettingStarted.pro9
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro2
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro4
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro4
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro4
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro4
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro4
-rw-r--r--examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro4
-rw-r--r--examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro4
-rw-r--r--examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro4
-rw-r--r--examples/widgets/tutorials/modelview/4_headers/4_headers.pro4
-rw-r--r--examples/widgets/tutorials/modelview/5_edit/5_edit.pro4
-rw-r--r--examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro4
-rw-r--r--examples/widgets/tutorials/modelview/7_selections/7_selections.pro4
-rw-r--r--examples/widgets/tutorials/modelview/modelview.pro4
-rw-r--r--examples/widgets/tutorials/threads/clock/clock.pro4
-rw-r--r--examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro4
-rw-r--r--examples/widgets/tutorials/threads/hellothread/hellothread.pro4
-rw-r--r--examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro4
-rw-r--r--examples/widgets/tutorials/threads/movedobject/movedobject.pro4
-rw-r--r--examples/widgets/tutorials/threads/threads.pro5
-rw-r--r--examples/widgets/tutorials/tutorials.pro6
-rw-r--r--examples/widgets/tutorials/widgets/childwidget/childwidget.pro4
-rw-r--r--examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro4
-rw-r--r--examples/widgets/tutorials/widgets/toplevel/toplevel.pro4
-rw-r--r--examples/widgets/tutorials/widgets/widgets.pro4
-rw-r--r--examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro4
-rw-r--r--examples/widgets/widgets.pro4
-rw-r--r--examples/widgets/widgets/analogclock/analogclock.pro4
-rw-r--r--examples/widgets/widgets/applicationicon/applicationicon.pro4
-rw-r--r--examples/widgets/widgets/calculator/calculator.pro4
-rw-r--r--examples/widgets/widgets/calendarwidget/calendarwidget.pro4
-rw-r--r--examples/widgets/widgets/charactermap/charactermap.pro4
-rw-r--r--examples/widgets/widgets/codeeditor/codeeditor.pro4
-rw-r--r--examples/widgets/widgets/digitalclock/digitalclock.pro4
-rw-r--r--examples/widgets/widgets/elidedlabel/elidedlabel.pro4
-rw-r--r--examples/widgets/widgets/groupbox/groupbox.pro4
-rw-r--r--examples/widgets/widgets/icons/icons.pro4
-rw-r--r--examples/widgets/widgets/imageviewer/imageviewer.pro4
-rw-r--r--examples/widgets/widgets/lineedits/lineedits.pro4
-rw-r--r--examples/widgets/widgets/mousebuttons/mousebuttons.pro6
-rw-r--r--examples/widgets/widgets/movie/movie.pro4
-rw-r--r--examples/widgets/widgets/orientation/orientation.pro4
-rw-r--r--examples/widgets/widgets/scribble/scribble.pro4
-rw-r--r--examples/widgets/widgets/shapedclock/shapedclock.pro4
-rw-r--r--examples/widgets/widgets/sliders/sliders.pro4
-rw-r--r--examples/widgets/widgets/spinboxes/spinboxes.pro4
-rw-r--r--examples/widgets/widgets/styles/styles.pro4
-rw-r--r--examples/widgets/widgets/stylesheet/stylesheet.pro4
-rw-r--r--examples/widgets/widgets/tablet/tablet.pro4
-rw-r--r--examples/widgets/widgets/tetrix/tetrix.pro4
-rw-r--r--examples/widgets/widgets/tooltips/tooltips.pro4
-rw-r--r--examples/widgets/widgets/validators/validators.pro4
-rw-r--r--examples/widgets/widgets/widgets.pro4
-rw-r--r--examples/widgets/widgets/wiggly/wiggly.pro4
-rw-r--r--examples/widgets/widgets/windowflags/windowflags.pro4
177 files changed, 375 insertions, 351 deletions
diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.pro b/examples/widgets/animation/animatedtiles/animatedtiles.pro
index 1bba99449c..b25d7e65c2 100644
--- a/examples/widgets/animation/animatedtiles/animatedtiles.pro
+++ b/examples/widgets/animation/animatedtiles/animatedtiles.pro
@@ -2,9 +2,9 @@ SOURCES = main.cpp
RESOURCES = animatedtiles.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/animatedtiles
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/animatedtiles
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animatedtiles.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/animatedtiles
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/animatedtiles
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/animation/animation.pro b/examples/widgets/animation/animation.pro
index b17aa0e0fe..fd22891f77 100644
--- a/examples/widgets/animation/animation.pro
+++ b/examples/widgets/animation/animation.pro
@@ -10,8 +10,8 @@ SUBDIRS += \
sub-attaq \
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animation.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/animation/appchooser/appchooser.pro b/examples/widgets/animation/appchooser/appchooser.pro
index 158a0eca9f..868fe59f8e 100644
--- a/examples/widgets/animation/appchooser/appchooser.pro
+++ b/examples/widgets/animation/appchooser/appchooser.pro
@@ -2,9 +2,9 @@ SOURCES = main.cpp
RESOURCES = appchooser.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/appchooser
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/appchooser
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/appchooser
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/appchooser
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/animation/easing/easing.pro b/examples/widgets/animation/easing/easing.pro
index 155d17d9b9..581103a4bf 100644
--- a/examples/widgets/animation/easing/easing.pro
+++ b/examples/widgets/animation/easing/easing.pro
@@ -8,9 +8,9 @@ FORMS = form.ui
RESOURCES = easing.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/easing
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/easing
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS easing.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/easing
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/easing
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/animation/moveblocks/moveblocks.pro b/examples/widgets/animation/moveblocks/moveblocks.pro
index 7c242e31e6..35693bf25d 100644
--- a/examples/widgets/animation/moveblocks/moveblocks.pro
+++ b/examples/widgets/animation/moveblocks/moveblocks.pro
@@ -1,9 +1,9 @@
SOURCES = main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/moveblocks
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/moveblocks
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS moveblocks.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/moveblocks
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/moveblocks
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/animation/states/states.pro b/examples/widgets/animation/states/states.pro
index adf0e8d58c..1aedc68f85 100644
--- a/examples/widgets/animation/states/states.pro
+++ b/examples/widgets/animation/states/states.pro
@@ -2,9 +2,9 @@ SOURCES += main.cpp
RESOURCES += states.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/states
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/states
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/states
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/states
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/animation/stickman/stickman.pro b/examples/widgets/animation/stickman/stickman.pro
index 43aaec113d..16d9b79a71 100644
--- a/examples/widgets/animation/stickman/stickman.pro
+++ b/examples/widgets/animation/stickman/stickman.pro
@@ -15,9 +15,9 @@ SOURCES += main.cpp \
RESOURCES += stickman.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/stickman
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/stickman
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/stickman
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro animations
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/stickman
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/animation/sub-attaq/sub-attaq.pro b/examples/widgets/animation/sub-attaq/sub-attaq.pro
index 6d9b3195ac..0e738a5c96 100644
--- a/examples/widgets/animation/sub-attaq/sub-attaq.pro
+++ b/examples/widgets/animation/sub-attaq/sub-attaq.pro
@@ -30,13 +30,14 @@ SOURCES += boat.cpp \
RESOURCES += subattaq.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/sub-attaq
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/sub-attaq
sources.files = $$SOURCES \
$$HEADERS \
$$RESOURCES \
$$FORMS \
sub-attaq.pro \
- pics
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/sub-attaq
+ pics \
+ data.xml
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/sub-attaq
INSTALLS += target \
sources
diff --git a/examples/widgets/desktop/desktop.pro b/examples/widgets/desktop/desktop.pro
index adfa51f130..d190a3bc2f 100644
--- a/examples/widgets/desktop/desktop.pro
+++ b/examples/widgets/desktop/desktop.pro
@@ -3,9 +3,9 @@ CONFIG += ordered
SUBDIRS = screenshot systray
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/desktop/screenshot/screenshot.pro b/examples/widgets/desktop/screenshot/screenshot.pro
index e9f53f7450..db1a16a2e1 100644
--- a/examples/widgets/desktop/screenshot/screenshot.pro
+++ b/examples/widgets/desktop/screenshot/screenshot.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
screenshot.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/screenshot
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/screenshot
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/screenshot
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/screenshot
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/desktop/systray/systray.pro b/examples/widgets/desktop/systray/systray.pro
index 5fdcf1f9c8..57a4f5b681 100644
--- a/examples/widgets/desktop/systray/systray.pro
+++ b/examples/widgets/desktop/systray/systray.pro
@@ -6,9 +6,9 @@ RESOURCES = systray.qrc
QT += widgets
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/systray
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/systray
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/systray
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/systray
INSTALLS += target sources
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/dialogs/classwizard/classwizard.pro b/examples/widgets/dialogs/classwizard/classwizard.pro
index d50ba675af..d02b703846 100644
--- a/examples/widgets/dialogs/classwizard/classwizard.pro
+++ b/examples/widgets/dialogs/classwizard/classwizard.pro
@@ -4,9 +4,9 @@ SOURCES = classwizard.cpp \
RESOURCES = classwizard.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/classwizard
sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/classwizard
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/dialogs/configdialog/configdialog.pro b/examples/widgets/dialogs/configdialog/configdialog.pro
index 643c2a238f..6c52d6639f 100644
--- a/examples/widgets/dialogs/configdialog/configdialog.pro
+++ b/examples/widgets/dialogs/configdialog/configdialog.pro
@@ -6,9 +6,9 @@ SOURCES = configdialog.cpp \
RESOURCES += configdialog.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/configdialog
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/configdialog
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/configdialog
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/configdialog
INSTALLS += target sources
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
diff --git a/examples/widgets/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro
index a59e480efa..8662fc5be2 100644
--- a/examples/widgets/dialogs/dialogs.pro
+++ b/examples/widgets/dialogs/dialogs.pro
@@ -13,7 +13,7 @@ wince*: SUBDIRS += sipdialog
# install
sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs
INSTALLS += sources
QT += widgets
diff --git a/examples/widgets/dialogs/extension/extension.pro b/examples/widgets/dialogs/extension/extension.pro
index 7e11dda4ab..4b538e15a5 100644
--- a/examples/widgets/dialogs/extension/extension.pro
+++ b/examples/widgets/dialogs/extension/extension.pro
@@ -3,9 +3,9 @@ SOURCES = finddialog.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/extension
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/extension
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/dialogs/findfiles/findfiles.pro b/examples/widgets/dialogs/findfiles/findfiles.pro
index 51d1c0eed1..a2f33ea29e 100644
--- a/examples/widgets/dialogs/findfiles/findfiles.pro
+++ b/examples/widgets/dialogs/findfiles/findfiles.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/findfiles
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/findfiles
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.pro b/examples/widgets/dialogs/licensewizard/licensewizard.pro
index c61325772e..fe395786dc 100644
--- a/examples/widgets/dialogs/licensewizard/licensewizard.pro
+++ b/examples/widgets/dialogs/licensewizard/licensewizard.pro
@@ -4,9 +4,9 @@ SOURCES = licensewizard.cpp \
RESOURCES = licensewizard.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/licensewizard
sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/licensewizard
INSTALLS += target sources
QT += widgets printsupport
diff --git a/examples/widgets/dialogs/sipdialog/sipdialog.pro b/examples/widgets/dialogs/sipdialog/sipdialog.pro
index 72db93f646..ae395fdd2c 100644
--- a/examples/widgets/dialogs/sipdialog/sipdialog.pro
+++ b/examples/widgets/dialogs/sipdialog/sipdialog.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
dialog.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/sipdialog
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/sipdialog
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/sipdialog
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/sipdialog
INSTALLS += target sources
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
diff --git a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro
index cbcb4d7302..f18034d7ae 100644
--- a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro
+++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro
@@ -3,9 +3,9 @@ SOURCES = dialog.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/standarddialogs
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/standarddialogs
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/standarddialogs
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/standarddialogs
INSTALLS += target sources
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.pro b/examples/widgets/dialogs/tabdialog/tabdialog.pro
index 66ac14daf2..fc3ad17dea 100644
--- a/examples/widgets/dialogs/tabdialog/tabdialog.pro
+++ b/examples/widgets/dialogs/tabdialog/tabdialog.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
tabdialog.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/tabdialog
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/tabdialog
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/tabdialog
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/tabdialog
INSTALLS += target sources
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
diff --git a/examples/widgets/dialogs/trivialwizard/trivialwizard.pro b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro
index 26d488d99d..c9859bc578 100644
--- a/examples/widgets/dialogs/trivialwizard/trivialwizard.pro
+++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro
@@ -1,9 +1,9 @@
SOURCES = trivialwizard.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/trivialwizard
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/trivialwizard
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/draganddrop/draganddrop.pro b/examples/widgets/draganddrop/draganddrop.pro
index a209ae31e4..59134fb978 100644
--- a/examples/widgets/draganddrop/draganddrop.pro
+++ b/examples/widgets/draganddrop/draganddrop.pro
@@ -8,6 +8,6 @@ SUBDIRS = draggableicons \
wince*: SUBDIRS -= dropsite
# install
sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop
INSTALLS += sources
QT += widgets
diff --git a/examples/widgets/draganddrop/draggableicons/draggableicons.pro b/examples/widgets/draganddrop/draggableicons/draggableicons.pro
index 9f4156135f..41e832fcc6 100644
--- a/examples/widgets/draganddrop/draggableicons/draggableicons.pro
+++ b/examples/widgets/draganddrop/draggableicons/draggableicons.pro
@@ -4,9 +4,9 @@ SOURCES = dragwidget.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggableicons
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggableicons
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggableicons
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggableicons
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/draganddrop/draggabletext/draggabletext.pro b/examples/widgets/draganddrop/draggabletext/draggabletext.pro
index 1fd8e5ce6e..669c3a32cc 100644
--- a/examples/widgets/draganddrop/draggabletext/draggabletext.pro
+++ b/examples/widgets/draganddrop/draggabletext/draggabletext.pro
@@ -6,9 +6,9 @@ SOURCES = draglabel.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggabletext
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggabletext
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.txt *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggabletext
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggabletext
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/draganddrop/dropsite/dropsite.pro b/examples/widgets/draganddrop/dropsite/dropsite.pro
index 8198b19e79..abb171ad3c 100644
--- a/examples/widgets/draganddrop/dropsite/dropsite.pro
+++ b/examples/widgets/draganddrop/dropsite/dropsite.pro
@@ -5,9 +5,9 @@ SOURCES = droparea.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/dropsite
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/dropsite
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/dropsite
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/dropsite
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro b/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro
index 2bbfdf0b3a..95159ccdf5 100644
--- a/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro
+++ b/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro
@@ -6,9 +6,9 @@ SOURCES = draglabel.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/fridgemagnets
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/fridgemagnets
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/fridgemagnets
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/fridgemagnets
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/draganddrop/puzzle/puzzle.pro b/examples/widgets/draganddrop/puzzle/puzzle.pro
index 7c69a41a39..3407a5e094 100644
--- a/examples/widgets/draganddrop/puzzle/puzzle.pro
+++ b/examples/widgets/draganddrop/puzzle/puzzle.pro
@@ -10,9 +10,9 @@ SOURCES = main.cpp \
QMAKE_PROJECT_NAME = dndpuzzle
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/puzzle
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/puzzle
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/puzzle
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/puzzle
INSTALLS += target sources
wince*: {
diff --git a/examples/widgets/effects/blurpicker/blurpicker.pro b/examples/widgets/effects/blurpicker/blurpicker.pro
index c477ea6e39..640b40936a 100644
--- a/examples/widgets/effects/blurpicker/blurpicker.pro
+++ b/examples/widgets/effects/blurpicker/blurpicker.pro
@@ -3,9 +3,9 @@ HEADERS += blurpicker.h blureffect.h
RESOURCES += blurpicker.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/blurpicker
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blurpicker.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/blurpicker
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects/blurpicker
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blurpicker.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects/blurpicker
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/effects/effects.pro b/examples/widgets/effects/effects.pro
index db7b8a723e..db6ab7dccc 100644
--- a/examples/widgets/effects/effects.pro
+++ b/examples/widgets/effects/effects.pro
@@ -6,9 +6,9 @@ SUBDIRS = \
fademessage
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS effects.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/effects/fademessage/fademessage.pro b/examples/widgets/effects/fademessage/fademessage.pro
index 98161e0be4..d7ec946180 100644
--- a/examples/widgets/effects/fademessage/fademessage.pro
+++ b/examples/widgets/effects/fademessage/fademessage.pro
@@ -4,14 +4,14 @@ RESOURCES += fademessage.qrc
INSTALLS += target sources
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/fademessage
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects/fademessage
sources.files = $$SOURCES \
$$HEADERS \
$$RESOURCES \
$$FORMS \
fademessage.pro \
background.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/fademessage
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects/fademessage
QT += widgets
diff --git a/examples/widgets/effects/lighting/lighting.pro b/examples/widgets/effects/lighting/lighting.pro
index 16be936b26..8ad08c2d09 100644
--- a/examples/widgets/effects/lighting/lighting.pro
+++ b/examples/widgets/effects/lighting/lighting.pro
@@ -2,9 +2,9 @@ SOURCES += main.cpp lighting.cpp
HEADERS += lighting.h
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/lighting
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects/lighting
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lighting.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/lighting
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects/lighting
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro b/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro
index 7b18a621db..bc8204edca 100644
--- a/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro
+++ b/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro
@@ -1,9 +1,9 @@
SOURCES = main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/anchorlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/anchorlayout
sources.files = $$SOURCES $$HEADERS $$RESOURCES anchorlayout.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/anchorlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/anchorlayout
INSTALLS += target sources
TARGET = anchorlayout
diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro b/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
index 202c8d87a0..47750be15b 100644
--- a/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
+++ b/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
@@ -6,9 +6,9 @@ SOURCES = layoutitem.cpp \
RESOURCES = basicgraphicslayouts.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/basicgraphicslayouts
-sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/basicgraphicslayouts
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/basicgraphicslayouts
+sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/basicgraphicslayouts
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro
index 0564ae0ba6..6cfecf1dd0 100644
--- a/examples/widgets/graphicsview/boxes/boxes.pro
+++ b/examples/widgets/graphicsview/boxes/boxes.pro
@@ -20,11 +20,11 @@ SOURCES += 3rdparty/fbm.c \
RESOURCES += boxes.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/boxes
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/boxes
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg *.png *.fsh *.vsh *.par
sources.files -= 3rdparty/fbm.h 3rdparty/fbm.c
sources.files += 3rdparty
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/boxes
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/boxes
INSTALLS += target sources
wince*: {
diff --git a/examples/widgets/graphicsview/chip/chip.pro b/examples/widgets/graphicsview/chip/chip.pro
index afe748946e..d58253e2b6 100644
--- a/examples/widgets/graphicsview/chip/chip.pro
+++ b/examples/widgets/graphicsview/chip/chip.pro
@@ -14,8 +14,8 @@ build_all:!build_pass {
}
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/chip
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/chip
INSTALLS += target sources
diff --git a/examples/widgets/graphicsview/collidingmice/collidingmice.pro b/examples/widgets/graphicsview/collidingmice/collidingmice.pro
index d8346023ba..8135c6300a 100644
--- a/examples/widgets/graphicsview/collidingmice/collidingmice.pro
+++ b/examples/widgets/graphicsview/collidingmice/collidingmice.pro
@@ -8,9 +8,9 @@ RESOURCES += \
mice.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/collidingmice
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/collidingmice
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/collidingmice
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/collidingmice
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.pro b/examples/widgets/graphicsview/diagramscene/diagramscene.pro
index e45f4a894b..ae6c903e64 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramscene.pro
+++ b/examples/widgets/graphicsview/diagramscene/diagramscene.pro
@@ -13,9 +13,9 @@ RESOURCES = diagramscene.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/diagramscene
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/diagramscene
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/diagramscene
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/diagramscene
INSTALLS += target sources
diff --git a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro
index 3e33bad2f9..6e41f78d4f 100644
--- a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro
+++ b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro
@@ -12,9 +12,9 @@ RESOURCES += \
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/dragdroprobot
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/dragdroprobot
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/dragdroprobot
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/dragdroprobot
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro b/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro
index 2a61809457..d1f242597e 100644
--- a/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro
+++ b/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro
@@ -12,9 +12,9 @@ SOURCES += \
TARGET.EPOCHEAPSIZE = 0x200000 0xA00000
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/elasticnodes
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/elasticnodes
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS elasticnodes.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/elasticnodes
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/elasticnodes
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro
index 6244df4b68..f59e8b5a2c 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro
+++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro
@@ -11,9 +11,9 @@ build_all:!build_pass {
}
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/embeddeddialogs
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/embeddeddialogs
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.icns *.ico *.rc *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/embeddeddialogs
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/embeddeddialogs
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/graphicsview/flowlayout/flowlayout.pro b/examples/widgets/graphicsview/flowlayout/flowlayout.pro
index 5f69a74d60..bc83c06f44 100644
--- a/examples/widgets/graphicsview/flowlayout/flowlayout.pro
+++ b/examples/widgets/graphicsview/flowlayout/flowlayout.pro
@@ -6,9 +6,9 @@ HEADERS += flowlayout.h window.h
SOURCES += flowlayout.cpp main.cpp window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/flowlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/flowlayout
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/flowlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/flowlayout
INSTALLS += target sources
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/graphicsview/graphicsview.pro b/examples/widgets/graphicsview/graphicsview.pro
index 6b7de527c6..667252d523 100644
--- a/examples/widgets/graphicsview/graphicsview.pro
+++ b/examples/widgets/graphicsview/graphicsview.pro
@@ -20,9 +20,9 @@ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG,
}
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.pro b/examples/widgets/graphicsview/padnavigator/padnavigator.pro
index 4b9733bb9b..43ec031452 100644
--- a/examples/widgets/graphicsview/padnavigator/padnavigator.pro
+++ b/examples/widgets/graphicsview/padnavigator/padnavigator.pro
@@ -20,9 +20,9 @@ QT += widgets
contains(QT_CONFIG, opengl):QT += opengl
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/padnavigator
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/padnavigator
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS padnavigator.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/padnavigator
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/padnavigator
INSTALLS += target sources
CONFIG += console
diff --git a/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro b/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro
index b044d4e91c..d3b74c43f8 100644
--- a/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro
+++ b/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro
@@ -1,9 +1,9 @@
SOURCES = main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/simpleanchorlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/simpleanchorlayout
sources.files = $$SOURCES $$HEADERS $$RESOURCES simpleanchorlayout.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/simpleanchorlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/simpleanchorlayout
INSTALLS += target sources
TARGET = simpleanchorlayout
diff --git a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro b/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
index b6eb292a12..5fba67f0ba 100644
--- a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
+++ b/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
@@ -4,9 +4,9 @@ SOURCES += main.cpp
RESOURCES += weatheranchorlayout.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/weatheranchorlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/weatheranchorlayout
sources.files = $$SOURCES $$HEADERS $$RESOURCES weatheranchorlayout.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/weatheranchorlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/weatheranchorlayout
INSTALLS += target sources
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/itemviews/addressbook/addressbook.pro b/examples/widgets/itemviews/addressbook/addressbook.pro
index 32cbc4ca36..f7eafc19cb 100644
--- a/examples/widgets/itemviews/addressbook/addressbook.pro
+++ b/examples/widgets/itemviews/addressbook/addressbook.pro
@@ -11,9 +11,9 @@ HEADERS = adddialog.h \
tablemodel.h
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/addressbook
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/addressbook
sources.files = $$SOURCES $$HEADERS $$RESOURCES addressbook.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/addressbook
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/addressbook
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
index 75f96e4d48..ec0b683cef 100644
--- a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
+++ b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
@@ -4,9 +4,9 @@ SOURCES = main.cpp \
CONFIG += qt
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/basicsortfiltermodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/basicsortfiltermodel
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/basicsortfiltermodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/basicsortfiltermodel
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/chart/chart.pro b/examples/widgets/itemviews/chart/chart.pro
index 310bb85ad7..5aacbf92ba 100644
--- a/examples/widgets/itemviews/chart/chart.pro
+++ b/examples/widgets/itemviews/chart/chart.pro
@@ -9,9 +9,9 @@ unix:!mac:!vxworks:!integrity:LIBS+= -lm
TARGET.EPOCHEAPSIZE = 0x200000 0x800000
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/chart
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/chart
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.cht
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/chart
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/chart
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro b/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
index 07e1296e06..c146aa7635 100644
--- a/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
+++ b/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
@@ -5,9 +5,9 @@ SOURCES = colorlisteditor.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/coloreditorfactory
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/coloreditorfactory
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/coloreditorfactory
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/coloreditorfactory
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro b/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
index 9ea1fa0e25..4be203a827 100644
--- a/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
+++ b/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/combowidgetmapper
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/combowidgetmapper
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/combowidgetmapper
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/combowidgetmapper
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
index a2288b953c..fe3fc84c81 100644
--- a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
+++ b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
@@ -6,9 +6,9 @@ SOURCES = main.cpp \
CONFIG += qt
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/customsortfiltermodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/customsortfiltermodel
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/customsortfiltermodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/customsortfiltermodel
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/dirview/dirview.pro b/examples/widgets/itemviews/dirview/dirview.pro
index 825f20c630..103fc457cb 100644
--- a/examples/widgets/itemviews/dirview/dirview.pro
+++ b/examples/widgets/itemviews/dirview/dirview.pro
@@ -1,9 +1,9 @@
SOURCES = main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/dirview
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/dirview
sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/dirview
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/dirview
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
index f86298542d..3e43837ee6 100644
--- a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
+++ b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
@@ -10,9 +10,9 @@ SOURCES = mainwindow.cpp \
CONFIG += qt
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/editabletreemodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/editabletreemodel
sources.files = $$FORMS $$HEADERS $$RESOURCES $$SOURCES *.pro *.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/editabletreemodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/editabletreemodel
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/fetchmore/fetchmore.pro b/examples/widgets/itemviews/fetchmore/fetchmore.pro
index 28af7e9ac0..0dd9ee6a5d 100644
--- a/examples/widgets/itemviews/fetchmore/fetchmore.pro
+++ b/examples/widgets/itemviews/fetchmore/fetchmore.pro
@@ -5,9 +5,9 @@ SOURCES = filelistmodel.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/fetchmore
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/fetchmore
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/fetchmore
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/fetchmore
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/frozencolumn/frozencolumn.pro b/examples/widgets/itemviews/frozencolumn/frozencolumn.pro
index 34a4a4de8c..2d9639ba22 100644
--- a/examples/widgets/itemviews/frozencolumn/frozencolumn.pro
+++ b/examples/widgets/itemviews/frozencolumn/frozencolumn.pro
@@ -3,9 +3,9 @@ SOURCES += main.cpp freezetablewidget.cpp
RESOURCES += grades.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/frozencolumn
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/frozencolumn
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/frozencolumn
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro grades.txt
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/frozencolumn
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/interview/interview.pro b/examples/widgets/itemviews/interview/interview.pro
index 5cd0d1f9fc..1f8f21db50 100644
--- a/examples/widgets/itemviews/interview/interview.pro
+++ b/examples/widgets/itemviews/interview/interview.pro
@@ -11,9 +11,9 @@ build_all:!build_pass {
}
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/interview
sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/interview
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/itemviews.pro b/examples/widgets/itemviews/itemviews.pro
index 347c259bc2..8457e88d6f 100644
--- a/examples/widgets/itemviews/itemviews.pro
+++ b/examples/widgets/itemviews/itemviews.pro
@@ -19,7 +19,7 @@ SUBDIRS = addressbook \
# install
sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews
INSTALLS += sources
QT += widgets
diff --git a/examples/widgets/itemviews/pixelator/pixelator.pro b/examples/widgets/itemviews/pixelator/pixelator.pro
index 48f8a58a58..dd1ba73ac4 100644
--- a/examples/widgets/itemviews/pixelator/pixelator.pro
+++ b/examples/widgets/itemviews/pixelator/pixelator.pro
@@ -8,9 +8,9 @@ SOURCES = imagemodel.cpp \
RESOURCES += images.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/pixelator
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/pixelator
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/pixelator
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/pixelator
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/puzzle/puzzle.pro b/examples/widgets/itemviews/puzzle/puzzle.pro
index 3f76bd8fd5..3c053e30ad 100644
--- a/examples/widgets/itemviews/puzzle/puzzle.pro
+++ b/examples/widgets/itemviews/puzzle/puzzle.pro
@@ -8,9 +8,9 @@ SOURCES = main.cpp \
puzzlewidget.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/puzzle
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/puzzle
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/puzzle
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/puzzle
INSTALLS += target sources
diff --git a/examples/widgets/itemviews/simpledommodel/simpledommodel.pro b/examples/widgets/itemviews/simpledommodel/simpledommodel.pro
index 2d30e71c1a..c02aeb373a 100644
--- a/examples/widgets/itemviews/simpledommodel/simpledommodel.pro
+++ b/examples/widgets/itemviews/simpledommodel/simpledommodel.pro
@@ -9,8 +9,8 @@ CONFIG += qt
QT += xml widgets
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpledommodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpledommodel
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpledommodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpledommodel
INSTALLS += target sources
diff --git a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
index cd4f8af604..7c56cdaf30 100644
--- a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
+++ b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
@@ -7,9 +7,9 @@ SOURCES = treeitem.cpp \
CONFIG += qt
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpletreemodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpletreemodel
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpletreemodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpletreemodel
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro b/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro
index 3b2fd8b257..e8ff67d571 100644
--- a/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro
+++ b/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simplewidgetmapper
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simplewidgetmapper
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simplewidgetmapper
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simplewidgetmapper
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
index f6416ff936..870c9d16b6 100644
--- a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
+++ b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
@@ -3,9 +3,9 @@ SOURCES = delegate.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spinboxdelegate
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spinboxdelegate
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spinboxdelegate
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spinboxdelegate
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.pro b/examples/widgets/itemviews/spreadsheet/spreadsheet.pro
index 48fd07e7fd..14d6b70441 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheet.pro
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.pro
@@ -16,8 +16,8 @@ build_all:!build_pass {
}
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spreadsheet
sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spreadsheet
INSTALLS += target sources
diff --git a/examples/widgets/itemviews/stardelegate/stardelegate.pro b/examples/widgets/itemviews/stardelegate/stardelegate.pro
index 915c26a524..56f85d876e 100644
--- a/examples/widgets/itemviews/stardelegate/stardelegate.pro
+++ b/examples/widgets/itemviews/stardelegate/stardelegate.pro
@@ -7,9 +7,9 @@ SOURCES = main.cpp \
starrating.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/stardelegate
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/stardelegate
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/stardelegate
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/stardelegate
INSTALLS += target sources
diff --git a/examples/widgets/layouts/basiclayouts/basiclayouts.pro b/examples/widgets/layouts/basiclayouts/basiclayouts.pro
index b2c4ad896f..3c3710e0fd 100644
--- a/examples/widgets/layouts/basiclayouts/basiclayouts.pro
+++ b/examples/widgets/layouts/basiclayouts/basiclayouts.pro
@@ -3,9 +3,9 @@ SOURCES = dialog.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/basiclayouts
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/basiclayouts
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/basiclayouts
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/basiclayouts
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/layouts/borderlayout/borderlayout.pro b/examples/widgets/layouts/borderlayout/borderlayout.pro
index 6727af60d7..8f0d40dc26 100644
--- a/examples/widgets/layouts/borderlayout/borderlayout.pro
+++ b/examples/widgets/layouts/borderlayout/borderlayout.pro
@@ -5,9 +5,9 @@ SOURCES = borderlayout.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/borderlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/borderlayout
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/borderlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/borderlayout
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro
index 3cc4c084a5..2d7c7c5b90 100644
--- a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro
+++ b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro
@@ -3,9 +3,9 @@ SOURCES = dialog.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/dynamiclayouts
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/dynamiclayouts
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/dynamiclayouts
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/dynamiclayouts
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/layouts/flowlayout/flowlayout.pro b/examples/widgets/layouts/flowlayout/flowlayout.pro
index 4ac0a43c26..df13f5e11d 100644
--- a/examples/widgets/layouts/flowlayout/flowlayout.pro
+++ b/examples/widgets/layouts/flowlayout/flowlayout.pro
@@ -5,9 +5,9 @@ SOURCES = flowlayout.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/flowlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/flowlayout
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/flowlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/flowlayout
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/layouts/layouts.pro b/examples/widgets/layouts/layouts.pro
index 8299052d4f..cb1a44e61e 100644
--- a/examples/widgets/layouts/layouts.pro
+++ b/examples/widgets/layouts/layouts.pro
@@ -6,7 +6,7 @@ SUBDIRS = basiclayouts \
# install
sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts
INSTALLS += sources
QT += widgets
diff --git a/examples/widgets/mainwindows/application/application.pro b/examples/widgets/mainwindows/application/application.pro
index ef866a6d5f..cbf8b60760 100644
--- a/examples/widgets/mainwindows/application/application.pro
+++ b/examples/widgets/mainwindows/application/application.pro
@@ -6,9 +6,9 @@ RESOURCES = application.qrc
#! [0]
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/application
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/application
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS application.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/application
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/application
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro
index 7e0da2496e..c52c883d2e 100644
--- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro
+++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro
@@ -4,9 +4,9 @@ SOURCES = main.cpp \
RESOURCES = dockwidgets.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/dockwidgets
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/dockwidgets
sources.files = $$SOURCES $$HEADERS $$RESOURCES dockwidgets.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/dockwidgets
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/dockwidgets
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.pro b/examples/widgets/mainwindows/mainwindow/mainwindow.pro
index 1381c460c2..2ff1dafcf8 100644
--- a/examples/widgets/mainwindows/mainwindow/mainwindow.pro
+++ b/examples/widgets/mainwindows/mainwindow/mainwindow.pro
@@ -9,9 +9,9 @@ build_all:!build_pass {
RESOURCES += mainwindow.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mainwindow
sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mainwindow
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/mainwindows/mainwindows.pro b/examples/widgets/mainwindows/mainwindows.pro
index c30d29e95a..021e442acb 100644
--- a/examples/widgets/mainwindows/mainwindows.pro
+++ b/examples/widgets/mainwindows/mainwindows.pro
@@ -8,9 +8,9 @@ SUBDIRS = application \
sdi
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/mainwindows/mdi/mdi.pro b/examples/widgets/mainwindows/mdi/mdi.pro
index a4387fecd6..82f08daf48 100644
--- a/examples/widgets/mainwindows/mdi/mdi.pro
+++ b/examples/widgets/mainwindows/mdi/mdi.pro
@@ -6,9 +6,9 @@ SOURCES = main.cpp \
RESOURCES = mdi.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mdi
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mdi
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mdi.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mdi
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mdi
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/mainwindows/menus/menus.pro b/examples/widgets/mainwindows/menus/menus.pro
index 5ed1e0dae5..06de2ebf42 100644
--- a/examples/widgets/mainwindows/menus/menus.pro
+++ b/examples/widgets/mainwindows/menus/menus.pro
@@ -3,9 +3,9 @@ SOURCES = mainwindow.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/menus
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/menus
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/menus
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/menus
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/mainwindows/recentfiles/recentfiles.pro b/examples/widgets/mainwindows/recentfiles/recentfiles.pro
index 5425efc68f..162532a239 100644
--- a/examples/widgets/mainwindows/recentfiles/recentfiles.pro
+++ b/examples/widgets/mainwindows/recentfiles/recentfiles.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
mainwindow.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/recentfiles
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/recentfiles
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS recentfiles.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/recentfiles
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/recentfiles
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/mainwindows/sdi/sdi.pro b/examples/widgets/mainwindows/sdi/sdi.pro
index cd5e0f1616..21515d8930 100644
--- a/examples/widgets/mainwindows/sdi/sdi.pro
+++ b/examples/widgets/mainwindows/sdi/sdi.pro
@@ -4,9 +4,9 @@ SOURCES = main.cpp \
RESOURCES = sdi.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/sdi
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/sdi
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sdi.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/sdi
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/sdi
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/painting/affine/affine.pro b/examples/widgets/painting/affine/affine.pro
index 0977ea1c5b..5a5e46f12f 100644
--- a/examples/widgets/painting/affine/affine.pro
+++ b/examples/widgets/painting/affine/affine.pro
@@ -14,9 +14,9 @@ include($$SHARED_FOLDER/shared.pri)
RESOURCES += affine.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/affine
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/affine
INSTALLS += target sources
wince*: {
diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.pro b/examples/widgets/painting/basicdrawing/basicdrawing.pro
index 0e0328e61f..fba796509c 100644
--- a/examples/widgets/painting/basicdrawing/basicdrawing.pro
+++ b/examples/widgets/painting/basicdrawing/basicdrawing.pro
@@ -6,9 +6,9 @@ SOURCES = main.cpp \
RESOURCES = basicdrawing.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/basicdrawing
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/basicdrawing
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basicdrawing.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/basicdrawing
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/basicdrawing
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro
index eb63d0c47a..0594cc0be3 100644
--- a/examples/widgets/painting/composition/composition.pro
+++ b/examples/widgets/painting/composition/composition.pro
@@ -13,9 +13,9 @@ contains(QT_CONFIG, opengl) {
QT += widgets
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/composition
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/composition
INSTALLS += target sources
diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.pro b/examples/widgets/painting/concentriccircles/concentriccircles.pro
index 0f87b991ed..dc40531565 100644
--- a/examples/widgets/painting/concentriccircles/concentriccircles.pro
+++ b/examples/widgets/painting/concentriccircles/concentriccircles.pro
@@ -5,9 +5,9 @@ SOURCES = circlewidget.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/concentriccircles
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/concentriccircles
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS concentriccircles.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/concentriccircles
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/concentriccircles
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/painting/deform/deform.pro b/examples/widgets/painting/deform/deform.pro
index 527133e7e5..a420ea941a 100644
--- a/examples/widgets/painting/deform/deform.pro
+++ b/examples/widgets/painting/deform/deform.pro
@@ -14,7 +14,7 @@ contains(QT_CONFIG, opengl) {
QT += widgets
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/deform
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/deform
INSTALLS += target sources
diff --git a/examples/widgets/painting/fontsampler/fontsampler.pro b/examples/widgets/painting/fontsampler/fontsampler.pro
index b918c51837..8cf2bf71fd 100644
--- a/examples/widgets/painting/fontsampler/fontsampler.pro
+++ b/examples/widgets/painting/fontsampler/fontsampler.pro
@@ -4,9 +4,9 @@ SOURCES = main.cpp \
mainwindow.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/fontsampler
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/fontsampler
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/painting/gradients/gradients.pro b/examples/widgets/painting/gradients/gradients.pro
index 4362d283ee..e1baeeb466 100644
--- a/examples/widgets/painting/gradients/gradients.pro
+++ b/examples/widgets/painting/gradients/gradients.pro
@@ -13,8 +13,8 @@ contains(QT_CONFIG, opengl) {
QT += widgets
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/gradients
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/gradients
INSTALLS += target sources
diff --git a/examples/widgets/painting/imagecomposition/imagecomposition.pro b/examples/widgets/painting/imagecomposition/imagecomposition.pro
index edf434f5d2..877270f5a8 100644
--- a/examples/widgets/painting/imagecomposition/imagecomposition.pro
+++ b/examples/widgets/painting/imagecomposition/imagecomposition.pro
@@ -4,9 +4,9 @@ SOURCES = imagecomposer.cpp \
RESOURCES = imagecomposition.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/imagecomposition
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/imagecomposition
sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/imagecomposition
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/imagecomposition
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/painting/painterpaths/painterpaths.pro b/examples/widgets/painting/painterpaths/painterpaths.pro
index c988ba26e0..3e5006f509 100644
--- a/examples/widgets/painting/painterpaths/painterpaths.pro
+++ b/examples/widgets/painting/painterpaths/painterpaths.pro
@@ -6,9 +6,9 @@ SOURCES = main.cpp \
unix:!mac:!vxworks:!integrity:LIBS += -lm
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/painterpaths
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/painterpaths
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painterpaths.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/painterpaths
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/painterpaths
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro
index 927d94006b..2fac6507e7 100644
--- a/examples/widgets/painting/painting.pro
+++ b/examples/widgets/painting/painting.pro
@@ -13,9 +13,9 @@ SUBDIRS = basicdrawing \
fontsampler
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/painting/pathstroke/pathstroke.pro b/examples/widgets/painting/pathstroke/pathstroke.pro
index 916866d1f2..ce5884fff7 100644
--- a/examples/widgets/painting/pathstroke/pathstroke.pro
+++ b/examples/widgets/painting/pathstroke/pathstroke.pro
@@ -14,8 +14,8 @@ contains(QT_CONFIG, opengl) {
QT += widgets
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/pathstroke
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/pathstroke
INSTALLS += target sources
diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro
index 212f3a20d7..a22bf608bd 100644
--- a/examples/widgets/painting/shared/shared.pro
+++ b/examples/widgets/painting/shared/shared.pro
@@ -26,9 +26,9 @@ HEADERS += \
RESOURCES += shared.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/shared
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/shared
INSTALLS += sources
!cross_compile:INSTALLS += target
diff --git a/examples/widgets/painting/transformations/transformations.pro b/examples/widgets/painting/transformations/transformations.pro
index a261c53371..665811d3c8 100644
--- a/examples/widgets/painting/transformations/transformations.pro
+++ b/examples/widgets/painting/transformations/transformations.pro
@@ -5,9 +5,9 @@ SOURCES = main.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/transformations
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/transformations
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/transformations
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/transformations
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/richtext/calendar/calendar.pro b/examples/widgets/richtext/calendar/calendar.pro
index 3867a027cf..6ed9b1cd32 100644
--- a/examples/widgets/richtext/calendar/calendar.pro
+++ b/examples/widgets/richtext/calendar/calendar.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
mainwindow.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/calendar
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/calendar
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/richtext/orderform/orderform.pro b/examples/widgets/richtext/orderform/orderform.pro
index 4aefb99428..067aab3875 100644
--- a/examples/widgets/richtext/orderform/orderform.pro
+++ b/examples/widgets/richtext/orderform/orderform.pro
@@ -5,9 +5,9 @@ SOURCES = detailsdialog.cpp \
mainwindow.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/orderform
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/orderform
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS orderform.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/orderform
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/orderform
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/richtext/richtext.pro b/examples/widgets/richtext/richtext.pro
index 511edb9ea9..168b5007e4 100644
--- a/examples/widgets/richtext/richtext.pro
+++ b/examples/widgets/richtext/richtext.pro
@@ -5,7 +5,7 @@ SUBDIRS = calendar \
textedit
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext
INSTALLS += target sources
diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
index 0f9b447a74..381b615b64 100644
--- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
+++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
@@ -5,9 +5,9 @@ SOURCES = highlighter.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/syntaxhighlighter
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/syntaxhighlighter
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS syntaxhighlighter.pro examples
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/syntaxhighlighter
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/syntaxhighlighter
INSTALLS += target sources
diff --git a/examples/widgets/richtext/textedit/textedit.pro b/examples/widgets/richtext/textedit/textedit.pro
index e172e79fe6..012aef0550 100644
--- a/examples/widgets/richtext/textedit/textedit.pro
+++ b/examples/widgets/richtext/textedit/textedit.pro
@@ -14,9 +14,9 @@ build_all:!build_pass {
}
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/textedit
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/textedit
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/scroller/graphicsview/graphicsview.pro b/examples/widgets/scroller/graphicsview/graphicsview.pro
index ccfb82d0ca..90c203a49b 100644
--- a/examples/widgets/scroller/graphicsview/graphicsview.pro
+++ b/examples/widgets/scroller/graphicsview/graphicsview.pro
@@ -2,8 +2,8 @@ TEMPLATE = app
SOURCES = main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/scroller/graphicsview
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scroller/graphicsview
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/scroller/graphicsview
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scroller/graphicsview
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/scroller/scroller.pro b/examples/widgets/scroller/scroller.pro
index bac3f26554..ef7671f6b0 100644
--- a/examples/widgets/scroller/scroller.pro
+++ b/examples/widgets/scroller/scroller.pro
@@ -1,2 +1,7 @@
TEMPLATE = subdirs
SUBDIRS += graphicsview
+
+# install
+sources.files = scroller.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scroller
+INSTALLS += sources
diff --git a/examples/widgets/statemachine/eventtransitions/eventtransitions.pro b/examples/widgets/statemachine/eventtransitions/eventtransitions.pro
index 8a9d84e646..36bfe8e6fb 100644
--- a/examples/widgets/statemachine/eventtransitions/eventtransitions.pro
+++ b/examples/widgets/statemachine/eventtransitions/eventtransitions.pro
@@ -1,9 +1,9 @@
SOURCES = main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/eventtransitions
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/eventtransitions
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS eventtransitions.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/eventtransitions
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/eventtransitions
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/statemachine/factorial/factorial.pro b/examples/widgets/statemachine/factorial/factorial.pro
index fe3dd23e87..6c831ea2cb 100644
--- a/examples/widgets/statemachine/factorial/factorial.pro
+++ b/examples/widgets/statemachine/factorial/factorial.pro
@@ -5,9 +5,9 @@ mac:CONFIG -= app_bundle
SOURCES += main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/factorial
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/factorial
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS factorial.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/factorial
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/factorial
INSTALLS += target sources
diff --git a/examples/widgets/statemachine/pingpong/pingpong.pro b/examples/widgets/statemachine/pingpong/pingpong.pro
index 1cfddaf282..b99060de75 100644
--- a/examples/widgets/statemachine/pingpong/pingpong.pro
+++ b/examples/widgets/statemachine/pingpong/pingpong.pro
@@ -5,9 +5,9 @@ mac:CONFIG -= app_bundle
SOURCES = main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/pingpong
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/pingpong
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pingpong.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/pingpong
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/pingpong
INSTALLS += target sources
diff --git a/examples/widgets/statemachine/rogue/rogue.pro b/examples/widgets/statemachine/rogue/rogue.pro
index 4ed132db06..32888d8390 100644
--- a/examples/widgets/statemachine/rogue/rogue.pro
+++ b/examples/widgets/statemachine/rogue/rogue.pro
@@ -4,9 +4,9 @@ SOURCES = main.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/rogue
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/rogue
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/rogue
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/rogue
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/statemachine/statemachine.pro b/examples/widgets/statemachine/statemachine.pro
index 7d510b29be..2a2d3b90ca 100644
--- a/examples/widgets/statemachine/statemachine.pro
+++ b/examples/widgets/statemachine/statemachine.pro
@@ -12,7 +12,7 @@ SUBDIRS = \
}
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS statemachine.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine
INSTALLS += target sources
diff --git a/examples/widgets/statemachine/trafficlight/trafficlight.pro b/examples/widgets/statemachine/trafficlight/trafficlight.pro
index 5bc0cdaef5..776da71c54 100644
--- a/examples/widgets/statemachine/trafficlight/trafficlight.pro
+++ b/examples/widgets/statemachine/trafficlight/trafficlight.pro
@@ -1,9 +1,9 @@
SOURCES = main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/trafficlight
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/trafficlight
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS trafficlight.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/trafficlight
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/trafficlight
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/statemachine/twowaybutton/twowaybutton.pro b/examples/widgets/statemachine/twowaybutton/twowaybutton.pro
index ffbd982845..d1d822c330 100644
--- a/examples/widgets/statemachine/twowaybutton/twowaybutton.pro
+++ b/examples/widgets/statemachine/twowaybutton/twowaybutton.pro
@@ -1,9 +1,9 @@
SOURCES = main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/twowaybutton
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/twowaybutton
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS twowaybutton.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/twowaybutton
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/twowaybutton
INSTALLS += target sources
QT += widgets
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
diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro
index 7fd2d62154..cbfba273ed 100644
--- a/examples/widgets/widgets.pro
+++ b/examples/widgets/widgets.pro
@@ -21,6 +21,6 @@ SUBDIRS = \
contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
# install
-sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]
+sources.files = *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets
INSTALLS += sources \ No newline at end of file
diff --git a/examples/widgets/widgets/analogclock/analogclock.pro b/examples/widgets/widgets/analogclock/analogclock.pro
index 5ba3a6f678..ee7186dd8c 100644
--- a/examples/widgets/widgets/analogclock/analogclock.pro
+++ b/examples/widgets/widgets/analogclock/analogclock.pro
@@ -5,9 +5,9 @@ SOURCES = analogclock.cpp \
QMAKE_PROJECT_NAME = widgets_analogclock
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/analogclock
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/analogclock
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS analogclock.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/analogclock
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/analogclock
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/applicationicon/applicationicon.pro b/examples/widgets/widgets/applicationicon/applicationicon.pro
index 0a3ba8bbdd..9f0a5002d1 100644
--- a/examples/widgets/widgets/applicationicon/applicationicon.pro
+++ b/examples/widgets/widgets/applicationicon/applicationicon.pro
@@ -11,7 +11,7 @@ OTHER_FILES += applicationicon.svg \
applicationicon.desktop
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/applicationicon
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/applicationicon
sources.files = $$SOURCES $$HEADERS applicationicon.svg applicationicon.png *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/applicationicon
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/applicationicon
INSTALLS += target sources
diff --git a/examples/widgets/widgets/calculator/calculator.pro b/examples/widgets/widgets/calculator/calculator.pro
index d237871e0d..68ec72400e 100644
--- a/examples/widgets/widgets/calculator/calculator.pro
+++ b/examples/widgets/widgets/calculator/calculator.pro
@@ -5,9 +5,9 @@ SOURCES = button.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/calculator
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/calculator
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calculator.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/calculator
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/calculator
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/calendarwidget/calendarwidget.pro b/examples/widgets/widgets/calendarwidget/calendarwidget.pro
index 3c75fb6a33..d3890a9b71 100644
--- a/examples/widgets/widgets/calendarwidget/calendarwidget.pro
+++ b/examples/widgets/widgets/calendarwidget/calendarwidget.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/calendarwidget
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/calendarwidget
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendarwidget.pro resources
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/calendarwidget
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/calendarwidget
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/charactermap/charactermap.pro b/examples/widgets/widgets/charactermap/charactermap.pro
index 0a9d6e7b5c..dab67c5a3d 100644
--- a/examples/widgets/widgets/charactermap/charactermap.pro
+++ b/examples/widgets/widgets/charactermap/charactermap.pro
@@ -5,9 +5,9 @@ SOURCES = characterwidget.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/charactermap
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/charactermap
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS charactermap.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/charactermap
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/charactermap
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/codeeditor/codeeditor.pro b/examples/widgets/widgets/codeeditor/codeeditor.pro
index ec38770cc6..ee861e8dfa 100644
--- a/examples/widgets/widgets/codeeditor/codeeditor.pro
+++ b/examples/widgets/widgets/codeeditor/codeeditor.pro
@@ -2,9 +2,9 @@ HEADERS = codeeditor.h
SOURCES = main.cpp \
codeeditor.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/codeeditor
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/codeeditor
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/codeeditor
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/codeeditor
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/digitalclock/digitalclock.pro b/examples/widgets/widgets/digitalclock/digitalclock.pro
index c0ad11e146..1f79fcba76 100644
--- a/examples/widgets/widgets/digitalclock/digitalclock.pro
+++ b/examples/widgets/widgets/digitalclock/digitalclock.pro
@@ -3,9 +3,9 @@ SOURCES = digitalclock.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/digitalclock
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/digitalclock
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS digitalclock.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/digitalclock
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/digitalclock
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/elidedlabel/elidedlabel.pro b/examples/widgets/widgets/elidedlabel/elidedlabel.pro
index f3fbc23d96..d360c3f6ed 100644
--- a/examples/widgets/widgets/elidedlabel/elidedlabel.pro
+++ b/examples/widgets/widgets/elidedlabel/elidedlabel.pro
@@ -15,7 +15,7 @@ HEADERS += \
elidedlabel.h
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/elidedlabel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/elidedlabel
sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/elidedlabel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/elidedlabel
INSTALLS += target sources
diff --git a/examples/widgets/widgets/groupbox/groupbox.pro b/examples/widgets/widgets/groupbox/groupbox.pro
index 07c0ed8818..8787c7d7f9 100644
--- a/examples/widgets/widgets/groupbox/groupbox.pro
+++ b/examples/widgets/widgets/groupbox/groupbox.pro
@@ -3,9 +3,9 @@ SOURCES = window.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/groupbox
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/groupbox
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS groupbox.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/groupbox
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/groupbox
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/icons/icons.pro b/examples/widgets/widgets/icons/icons.pro
index 8b0831117c..ca22d65bcb 100644
--- a/examples/widgets/widgets/icons/icons.pro
+++ b/examples/widgets/widgets/icons/icons.pro
@@ -9,9 +9,9 @@ SOURCES = iconpreviewarea.cpp \
mainwindow.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/icons
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/icons
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS icons.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/icons
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/icons
INSTALLS += target sources
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.pro b/examples/widgets/widgets/imageviewer/imageviewer.pro
index 15751ff3d9..b66ccf382d 100644
--- a/examples/widgets/widgets/imageviewer/imageviewer.pro
+++ b/examples/widgets/widgets/imageviewer/imageviewer.pro
@@ -3,9 +3,9 @@ SOURCES = imageviewer.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/imageviewer
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/imageviewer
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS imageviewer.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/imageviewer
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/imageviewer
INSTALLS += target sources
diff --git a/examples/widgets/widgets/lineedits/lineedits.pro b/examples/widgets/widgets/lineedits/lineedits.pro
index 01d4b2f1b7..8d16866ebf 100644
--- a/examples/widgets/widgets/lineedits/lineedits.pro
+++ b/examples/widgets/widgets/lineedits/lineedits.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/lineedits
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/lineedits
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lineedits.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/lineedits
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/lineedits
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/mousebuttons/mousebuttons.pro b/examples/widgets/widgets/mousebuttons/mousebuttons.pro
index ed181d082c..8b3bea1ae7 100644
--- a/examples/widgets/widgets/mousebuttons/mousebuttons.pro
+++ b/examples/widgets/widgets/mousebuttons/mousebuttons.pro
@@ -11,8 +11,8 @@ HEADERS += \
buttontester.h \
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mousebuttons
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS buttontester.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mousebuttons
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/mousebuttons
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mousebuttons.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/mousebuttons
INSTALLS += target sources
QT += core widgets
diff --git a/examples/widgets/widgets/movie/movie.pro b/examples/widgets/widgets/movie/movie.pro
index dd6e40b83c..81ae2243c5 100644
--- a/examples/widgets/widgets/movie/movie.pro
+++ b/examples/widgets/widgets/movie/movie.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
movieplayer.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/movie
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/movie
sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro animation.gif
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/movie
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/movie
INSTALLS += target sources
diff --git a/examples/widgets/widgets/orientation/orientation.pro b/examples/widgets/widgets/orientation/orientation.pro
index 36a3e91a9c..89786bec7d 100644
--- a/examples/widgets/widgets/orientation/orientation.pro
+++ b/examples/widgets/widgets/orientation/orientation.pro
@@ -23,9 +23,9 @@ RESOURCES += \
images.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/orientation
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/orientation
sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/orientation
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/orientation
INSTALLS += target sources
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/widgets/scribble/scribble.pro b/examples/widgets/widgets/scribble/scribble.pro
index 9c6e3cb100..eaed4679f1 100644
--- a/examples/widgets/widgets/scribble/scribble.pro
+++ b/examples/widgets/widgets/scribble/scribble.pro
@@ -5,9 +5,9 @@ SOURCES = main.cpp \
scribblearea.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scribble
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/scribble
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS scribble.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scribble
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/scribble
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/shapedclock/shapedclock.pro b/examples/widgets/widgets/shapedclock/shapedclock.pro
index 5bc1cb8706..a83f8b80d5 100644
--- a/examples/widgets/widgets/shapedclock/shapedclock.pro
+++ b/examples/widgets/widgets/shapedclock/shapedclock.pro
@@ -3,9 +3,9 @@ SOURCES = shapedclock.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/shapedclock
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/shapedclock
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS shapedclock.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/shapedclock
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/shapedclock
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/sliders/sliders.pro b/examples/widgets/widgets/sliders/sliders.pro
index b0438072ec..0ef1a0eed2 100644
--- a/examples/widgets/widgets/sliders/sliders.pro
+++ b/examples/widgets/widgets/sliders/sliders.pro
@@ -5,9 +5,9 @@ SOURCES = main.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/sliders
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/sliders
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sliders.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/sliders
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/sliders
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/spinboxes/spinboxes.pro b/examples/widgets/widgets/spinboxes/spinboxes.pro
index e19e33178d..b425882bf2 100644
--- a/examples/widgets/widgets/spinboxes/spinboxes.pro
+++ b/examples/widgets/widgets/spinboxes/spinboxes.pro
@@ -3,9 +3,9 @@ SOURCES = main.cpp \
window.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/spinboxes
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/spinboxes
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spinboxes.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/spinboxes
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/spinboxes
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/styles/styles.pro b/examples/widgets/widgets/styles/styles.pro
index 0be4f1ef3c..7fa0a4d7cd 100644
--- a/examples/widgets/widgets/styles/styles.pro
+++ b/examples/widgets/widgets/styles/styles.pro
@@ -8,9 +8,9 @@ RESOURCES = styles.qrc
REQUIRES += "contains(styles, windows)"
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/styles
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/styles
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styles.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/styles
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/styles
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/stylesheet/stylesheet.pro b/examples/widgets/widgets/stylesheet/stylesheet.pro
index 4d609a9210..da5c388fbf 100644
--- a/examples/widgets/widgets/stylesheet/stylesheet.pro
+++ b/examples/widgets/widgets/stylesheet/stylesheet.pro
@@ -8,9 +8,9 @@ SOURCES = main.cpp \
stylesheeteditor.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/stylesheet
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/stylesheet
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images layouts qss
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/stylesheet
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/stylesheet
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/tablet/tablet.pro b/examples/widgets/widgets/tablet/tablet.pro
index 9ad533fc64..5b0d4c1d84 100644
--- a/examples/widgets/widgets/tablet/tablet.pro
+++ b/examples/widgets/widgets/tablet/tablet.pro
@@ -7,9 +7,9 @@ SOURCES = mainwindow.cpp \
tabletapplication.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tablet
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/tablet
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tablet.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tablet
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/tablet
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/tetrix/tetrix.pro b/examples/widgets/widgets/tetrix/tetrix.pro
index 6e8a270335..59260fbc36 100644
--- a/examples/widgets/widgets/tetrix/tetrix.pro
+++ b/examples/widgets/widgets/tetrix/tetrix.pro
@@ -7,9 +7,9 @@ SOURCES = main.cpp \
tetrixwindow.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tetrix
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/tetrix
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tetrix.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tetrix
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/tetrix
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/tooltips/tooltips.pro b/examples/widgets/widgets/tooltips/tooltips.pro
index 76a6cd00f8..e3e8520f8d 100644
--- a/examples/widgets/widgets/tooltips/tooltips.pro
+++ b/examples/widgets/widgets/tooltips/tooltips.pro
@@ -6,9 +6,9 @@ SOURCES = main.cpp \
RESOURCES = tooltips.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tooltips
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/tooltips
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tooltips.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tooltips
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/tooltips
INSTALLS += target sources
QT += widgets
diff --git a/examples/widgets/widgets/validators/validators.pro b/examples/widgets/widgets/validators/validators.pro
index 7970f961cd..561d70ab07 100644
--- a/examples/widgets/widgets/validators/validators.pro
+++ b/examples/widgets/widgets/validators/validators.pro
@@ -7,9 +7,9 @@ SOURCES += main.cpp ledwidget.cpp localeselector.cpp
HEADERS += ledwidget.h localeselector.h
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/validators
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/validators
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/validators
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/validators
INSTALLS += target sources
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/widgets/widgets.pro b/examples/widgets/widgets/widgets.pro
index b14a587968..ec4d3af3bf 100644
--- a/examples/widgets/widgets/widgets.pro
+++ b/examples/widgets/widgets/widgets.pro
@@ -29,6 +29,6 @@ SUBDIRS = analogclock \
contains(styles, windows): SUBDIRS += styles
# install
-sources.files = widgets.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets
+sources.files = widgets.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets
INSTALLS += sources
diff --git a/examples/widgets/widgets/wiggly/wiggly.pro b/examples/widgets/widgets/wiggly/wiggly.pro
index 6b89cd1769..a7062fa7eb 100644
--- a/examples/widgets/widgets/wiggly/wiggly.pro
+++ b/examples/widgets/widgets/wiggly/wiggly.pro
@@ -7,7 +7,7 @@ SOURCES = wigglywidget.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/wiggly
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/wiggly
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wiggly.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/wiggly
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/wiggly
INSTALLS += target sources
diff --git a/examples/widgets/widgets/windowflags/windowflags.pro b/examples/widgets/widgets/windowflags/windowflags.pro
index b063b8ab2c..c98b7a8b9a 100644
--- a/examples/widgets/widgets/windowflags/windowflags.pro
+++ b/examples/widgets/widgets/windowflags/windowflags.pro
@@ -5,9 +5,9 @@ SOURCES = controllerwindow.cpp \
main.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/windowflags
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/windowflags
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowflags.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/windowflags
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/windowflags
INSTALLS += target sources
QT += widgets