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

This makes the structure of the examples after an 'make install' similar to the one in a 'developer build'. Change-Id: I9120bd741fab332e64e30adc01cefe87e5633454 Reviewed-by: Martin Smith <martin.smith@digia.com>
author: hjk <qthjk@ovi.com> 2012-11-26 14:04:31 +0100
committer: The Qt Project <gerrit-noreply@qt-project.org> 2012-11-26 14:35:23 +0100
commit: c527dd44be9cee5da06ce397f89e3a2595d4ed37 (patch)
tree: 05d6d59ff9439832735ba3ee429acb7be3994af0 /examples/widgets
parent: b34c48d95bf94f787fe693e28126e37a4bb485c1 (diff)
177 files changed, 344 insertions, 344 deletions
diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.pro b/examples/widgets/animation/animatedtiles/animatedtiles.pro
index b25d7e65c2..03907d10f4 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/widgets/animation/animatedtiles
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/animatedtiles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animatedtiles.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/animatedtiles
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/animatedtiles
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/animation/animation.pro b/examples/widgets/animation/animation.pro
index fd22891f77..7cc46a5613 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/widgets/animation
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animation.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation
 INSTALLS += target sources
 QT += widgets
diff --git a/examples/widgets/animation/appchooser/appchooser.pro b/examples/widgets/animation/appchooser/appchooser.pro
index 868fe59f8e..ac7b0ca335 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/widgets/animation/appchooser
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/appchooser
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/appchooser
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 581103a4bf..3263d07089 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/widgets/animation/easing
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/easing
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS easing.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/easing
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 35693bf25d..b7335652c0 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/widgets/animation/moveblocks
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/moveblocks
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS moveblocks.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/moveblocks
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 1aedc68f85..9ab3113111 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/widgets/animation/states
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/states
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/states
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 16d9b79a71..527fdf1132 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/widgets/animation/stickman
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/stickman
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro animations
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/stickman
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 0e738a5c96..835fc8d2d8 100644
--- a/examples/widgets/animation/sub-attaq/sub-attaq.pro
+++ b/examples/widgets/animation/sub-attaq/sub-attaq.pro
@@ -30,7 +30,7 @@ SOURCES += boat.cpp \
 RESOURCES += subattaq.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/sub-attaq
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/sub-attaq
 sources.files = $$SOURCES \
     $$HEADERS \
     $$RESOURCES \
@@ -38,6 +38,6 @@ sources.files = $$SOURCES \
     sub-attaq.pro \
     pics \
     data.xml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/sub-attaq
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/sub-attaq
 INSTALLS += target \
     sources
diff --git a/examples/widgets/desktop/desktop.pro b/examples/widgets/desktop/desktop.pro
index d190a3bc2f..79d85e41fa 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/widgets/desktop
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/desktop/screenshot/screenshot.pro b/examples/widgets/desktop/screenshot/screenshot.pro
index db1a16a2e1..bcab23918b 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/widgets/desktop/screenshot
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/screenshot
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/screenshot
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 57a4f5b681..c028b04f04 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/widgets/desktop/systray
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/systray
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/desktop/systray
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 d02b703846..9802584d75 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/widgets/dialogs/classwizard
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/classwizard
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/classwizard
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 6c52d6639f..fbef658523 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/widgets/dialogs/configdialog
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/configdialog
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/configdialog
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 8662fc5be2..af916ea029 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/widgets/dialogs
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs
 INSTALLS += sources
 
 QT += widgets
diff --git a/examples/widgets/dialogs/extension/extension.pro b/examples/widgets/dialogs/extension/extension.pro
index 4b538e15a5..91eccf5a72 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/widgets/dialogs/extension
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/extension
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/extension
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 a2f33ea29e..fe4ec427d3 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/widgets/dialogs/findfiles
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/findfiles
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/findfiles
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 fe395786dc..8d5bed4858 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/widgets/dialogs/licensewizard
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/licensewizard
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/licensewizard
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ae395fdd2c..57b4ac6331 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/widgets/dialogs/sipdialog
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/sipdialog
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/sipdialog
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 f18034d7ae..86bc7c46b1 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/widgets/dialogs/standarddialogs
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/standarddialogs
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/standarddialogs
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 fc3ad17dea..9c62dfb608 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/widgets/dialogs/tabdialog
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/tabdialog
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/tabdialog
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 c9859bc578..cf3d7316f5 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/widgets/dialogs/trivialwizard
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/trivialwizard
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/dialogs/trivialwizard
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/trivialwizard
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/draganddrop/draganddrop.pro b/examples/widgets/draganddrop/draganddrop.pro
index 59134fb978..06a161e1ac 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/widgets/draganddrop
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop
 INSTALLS += sources
 QT += widgets
diff --git a/examples/widgets/draganddrop/draggableicons/draggableicons.pro b/examples/widgets/draganddrop/draggableicons/draggableicons.pro
index 41e832fcc6..e9398e0342 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/widgets/draganddrop/draggableicons
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/draggableicons
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggableicons
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 669c3a32cc..db40af37cc 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/widgets/draganddrop/draggabletext
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/draggabletext
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.txt *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/draggabletext
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 abb171ad3c..06bca8a1ae 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/widgets/draganddrop/dropsite
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/dropsite
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/dropsite
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 95159ccdf5..ac6adb354c 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/widgets/draganddrop/fridgemagnets
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/fridgemagnets
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/fridgemagnets
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 3407a5e094..27acea6590 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/widgets/draganddrop/puzzle
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/puzzle
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/draganddrop/puzzle
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/puzzle
 INSTALLS += target sources
 
 wince*: {
diff --git a/examples/widgets/effects/blurpicker/blurpicker.pro b/examples/widgets/effects/blurpicker/blurpicker.pro
index 640b40936a..105b7a49e7 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/widgets/effects/blurpicker
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/blurpicker
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blurpicker.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects/blurpicker
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/blurpicker
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/effects/effects.pro b/examples/widgets/effects/effects.pro
index db6ab7dccc..74c2d1c039 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/widgets/effects
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS effects.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/effects/fademessage/fademessage.pro b/examples/widgets/effects/fademessage/fademessage.pro
index d7ec946180..89953eb18b 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/widgets/effects/fademessage
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/fademessage
 sources.files = $$SOURCES \
     $$HEADERS \
     $$RESOURCES \
     $$FORMS \
     fademessage.pro \
     background.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects/fademessage
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/fademessage
 
 
 QT += widgets
diff --git a/examples/widgets/effects/lighting/lighting.pro b/examples/widgets/effects/lighting/lighting.pro
index 8ad08c2d09..2ab7811e4f 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/widgets/effects/lighting
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/lighting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lighting.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/effects/lighting
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 bc8204edca..8fb03edd60 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/widgets/graphicsview/anchorlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/anchorlayout
 sources.files = $$SOURCES $$HEADERS $$RESOURCES anchorlayout.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/anchorlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 47750be15b..3de54d7757 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/widgets/graphicsview/basicgraphicslayouts
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/basicgraphicslayouts
 sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/basicgraphicslayouts
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 6cfecf1dd0..1fc91352c7 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/widgets/graphicsview/boxes
+target.path = $$[QT_INSTALL_EXAMPLES]/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/widgets/graphicsview/boxes
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes
 INSTALLS += target sources
 
 wince*: {
diff --git a/examples/widgets/graphicsview/chip/chip.pro b/examples/widgets/graphicsview/chip/chip.pro
index d58253e2b6..a979d60da0 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/widgets/graphicsview/chip
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/chip
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/chip
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/chip
 INSTALLS += target sources
 
diff --git a/examples/widgets/graphicsview/collidingmice/collidingmice.pro b/examples/widgets/graphicsview/collidingmice/collidingmice.pro
index 8135c6300a..10755cdb65 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/widgets/graphicsview/collidingmice
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/collidingmice
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/collidingmice
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ae6c903e64..cc97758b43 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/widgets/graphicsview/diagramscene
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/diagramscene
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/diagramscene
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/diagramscene
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro
index 6e41f78d4f..1e21ee8b9e 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/widgets/graphicsview/dragdroprobot
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/dragdroprobot
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/dragdroprobot
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 d1f242597e..160c7fbbdd 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/widgets/graphicsview/elasticnodes
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/elasticnodes
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS elasticnodes.pro 
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/elasticnodes
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 f59e8b5a2c..7b62473050 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/widgets/graphicsview/embeddeddialogs
+target.path = $$[QT_INSTALL_EXAMPLES]/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/widgets/graphicsview/embeddeddialogs
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 bc83c06f44..8a98c87032 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/widgets/graphicsview/flowlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/flowlayout
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/flowlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 667252d523..590e79c5d2 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/widgets/graphicsview
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.pro b/examples/widgets/graphicsview/padnavigator/padnavigator.pro
index 43ec031452..efbb09308f 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/widgets/graphicsview/padnavigator
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/padnavigator
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS padnavigator.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/padnavigator
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 d3b74c43f8..0378c375a1 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/widgets/graphicsview/simpleanchorlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/simpleanchorlayout
 sources.files = $$SOURCES $$HEADERS $$RESOURCES simpleanchorlayout.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/simpleanchorlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 5fba67f0ba..5cd625f9b4 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/widgets/graphicsview/weatheranchorlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/weatheranchorlayout
 sources.files = $$SOURCES $$HEADERS $$RESOURCES weatheranchorlayout.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/graphicsview/weatheranchorlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 f7eafc19cb..d9c98af291 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/widgets/itemviews/addressbook
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/addressbook
 sources.files = $$SOURCES $$HEADERS $$RESOURCES addressbook.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/addressbook
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ec0b683cef..7f30812305 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/widgets/itemviews/basicsortfiltermodel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/basicsortfiltermodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/basicsortfiltermodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 5aacbf92ba..3b1a5adf1d 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/widgets/itemviews/chart
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/chart
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.cht
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/chart
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 c146aa7635..4ee87e0b57 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/widgets/itemviews/coloreditorfactory
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/coloreditorfactory
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/coloreditorfactory
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 4be203a827..c4320625a9 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/widgets/itemviews/combowidgetmapper
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/combowidgetmapper
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/combowidgetmapper
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 fe3fc84c81..762f932c3c 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/widgets/itemviews/customsortfiltermodel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/customsortfiltermodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/customsortfiltermodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 103fc457cb..481bddf3b3 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/widgets/itemviews/dirview
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/dirview
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/dirview
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 3e43837ee6..43d9634a3b 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/widgets/itemviews/editabletreemodel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/editabletreemodel
 sources.files = $$FORMS $$HEADERS $$RESOURCES $$SOURCES *.pro *.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/editabletreemodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 0dd9ee6a5d..a0abf64b7a 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/widgets/itemviews/fetchmore
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/fetchmore
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/fetchmore
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 2d9639ba22..6d8074ebaa 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/widgets/itemviews/frozencolumn
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/frozencolumn
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro grades.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/frozencolumn
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 1f8f21db50..ce5e3cb316 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/widgets/itemviews/interview
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/interview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/interview
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/interview
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/itemviews.pro b/examples/widgets/itemviews/itemviews.pro
index 8457e88d6f..79d57acb78 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/widgets/itemviews
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews
 INSTALLS += sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/pixelator/pixelator.pro b/examples/widgets/itemviews/pixelator/pixelator.pro
index dd1ba73ac4..e5ba8e253f 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/widgets/itemviews/pixelator
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/pixelator
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/pixelator
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 3c053e30ad..fe912656d1 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/widgets/itemviews/puzzle
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/puzzle
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/puzzle
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/puzzle
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/itemviews/simpledommodel/simpledommodel.pro b/examples/widgets/itemviews/simpledommodel/simpledommodel.pro
index c02aeb373a..c0399bd96b 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/widgets/itemviews/simpledommodel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpledommodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpledommodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpledommodel
 INSTALLS += target sources
 
diff --git a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
index 7c56cdaf30..f18f8eb81f 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/widgets/itemviews/simpletreemodel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpletreemodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpletreemodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 e8ff67d571..fac8aabe57 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/widgets/itemviews/simplewidgetmapper
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simplewidgetmapper
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simplewidgetmapper
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 870c9d16b6..27ea88f50e 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/widgets/itemviews/spinboxdelegate
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/spinboxdelegate
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spinboxdelegate
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 14d6b70441..d551b900c8 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/widgets/itemviews/spreadsheet
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/spreadsheet
 sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spreadsheet
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/spreadsheet
 INSTALLS += target sources
 
diff --git a/examples/widgets/itemviews/stardelegate/stardelegate.pro b/examples/widgets/itemviews/stardelegate/stardelegate.pro
index 56f85d876e..4ea0d892ca 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/widgets/itemviews/stardelegate
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/stardelegate
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/stardelegate
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/stardelegate
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/layouts/basiclayouts/basiclayouts.pro b/examples/widgets/layouts/basiclayouts/basiclayouts.pro
index 3c3710e0fd..39cfa65661 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/widgets/layouts/basiclayouts
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/basiclayouts
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/basiclayouts
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 8f0d40dc26..0260162cbb 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/widgets/layouts/borderlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/borderlayout
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/borderlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 2d7c7c5b90..43e0606357 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/widgets/layouts/dynamiclayouts
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/dynamiclayouts
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/dynamiclayouts
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 df13f5e11d..f2a3e99226 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/widgets/layouts/flowlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/flowlayout
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/layouts/flowlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/flowlayout
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/layouts/layouts.pro b/examples/widgets/layouts/layouts.pro
index cb1a44e61e..230e6a5ce4 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/widgets/layouts
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts
 INSTALLS += sources
 
 QT += widgets
diff --git a/examples/widgets/mainwindows/application/application.pro b/examples/widgets/mainwindows/application/application.pro
index cbf8b60760..3768ce5d66 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/widgets/mainwindows/application
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/application
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS application.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/application
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 c52c883d2e..598cfae971 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/widgets/mainwindows/dockwidgets
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/dockwidgets
 sources.files = $$SOURCES $$HEADERS $$RESOURCES dockwidgets.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/dockwidgets
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 2ff1dafcf8..b5cd71b1bf 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/widgets/mainwindows/mainwindow
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/mainwindow
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mainwindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/mainwindow
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/mainwindows/mainwindows.pro b/examples/widgets/mainwindows/mainwindows.pro
index 021e442acb..1f2fa419f5 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/widgets/mainwindows
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/mainwindows/mdi/mdi.pro b/examples/widgets/mainwindows/mdi/mdi.pro
index 82f08daf48..88efd0e6cf 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/widgets/mainwindows/mdi
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/mdi
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mdi.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/mdi
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 06de2ebf42..e383b6c426 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/widgets/mainwindows/menus
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/menus
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/menus
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 162532a239..d11c47b850 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/widgets/mainwindows/recentfiles
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/recentfiles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS recentfiles.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/recentfiles
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 21515d8930..e9fc0b6bdd 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/widgets/mainwindows/sdi
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/sdi
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sdi.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/mainwindows/sdi
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 5a5e46f12f..b9c575ebb9 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/widgets/painting/affine
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/affine
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine
 INSTALLS += target sources
 
 wince*: {
diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.pro b/examples/widgets/painting/basicdrawing/basicdrawing.pro
index fba796509c..60b768f85a 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/widgets/painting/basicdrawing
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/basicdrawing
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basicdrawing.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/basicdrawing
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 0594cc0be3..05b38cee06 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/widgets/painting/composition
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/composition
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/composition
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/composition
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.pro b/examples/widgets/painting/concentriccircles/concentriccircles.pro
index dc40531565..1b97867752 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/widgets/painting/concentriccircles
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/concentriccircles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS concentriccircles.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/concentriccircles
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 a420ea941a..eff007464d 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/widgets/painting/deform
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/deform
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/deform
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/deform
 INSTALLS += target sources
diff --git a/examples/widgets/painting/fontsampler/fontsampler.pro b/examples/widgets/painting/fontsampler/fontsampler.pro
index 8cf2bf71fd..0f913b43a2 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/widgets/painting/fontsampler
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/fontsampler
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/fontsampler
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 e1baeeb466..ed78e4fd2a 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/widgets/painting/gradients
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/gradients
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/gradients
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/gradients
 INSTALLS += target sources
 
diff --git a/examples/widgets/painting/imagecomposition/imagecomposition.pro b/examples/widgets/painting/imagecomposition/imagecomposition.pro
index 877270f5a8..095e1e7f2d 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/widgets/painting/imagecomposition
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/imagecomposition
 sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/imagecomposition
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 3e5006f509..64635be53c 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/widgets/painting/painterpaths
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/painterpaths
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painterpaths.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/painterpaths
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/painterpaths
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro
index 2fac6507e7..99cb2397ff 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/widgets/painting
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/painting/pathstroke/pathstroke.pro b/examples/widgets/painting/pathstroke/pathstroke.pro
index ce5884fff7..0249d5a7c3 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/widgets/painting/pathstroke
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/pathstroke
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/pathstroke
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/pathstroke
 INSTALLS += target sources
 
diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro
index a22bf608bd..db94e7aafd 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/widgets/painting/shared
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/shared
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/shared
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 665811d3c8..3d27957a59 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/widgets/painting/transformations
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/transformations
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/painting/transformations
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 6ed9b1cd32..eeeb2f9c2e 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/widgets/richtext/calendar
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/calendar
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/calendar
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 067aab3875..a44a3f082e 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/widgets/richtext/orderform
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/orderform
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS orderform.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/orderform
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/orderform
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/richtext/richtext.pro b/examples/widgets/richtext/richtext.pro
index 168b5007e4..f8624e8b33 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/widgets/richtext
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext
 INSTALLS += target sources
diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
index 381b615b64..5bb2cec8cd 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/widgets/richtext/syntaxhighlighter
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS syntaxhighlighter.pro examples
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/syntaxhighlighter
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/richtext/textedit/textedit.pro b/examples/widgets/richtext/textedit/textedit.pro
index 012aef0550..35eaf8808c 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/widgets/richtext/textedit
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/textedit
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/richtext/textedit
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 90c203a49b..fdc009235b 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/widgets/scroller/graphicsview
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/scroller/graphicsview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scroller/graphicsview
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/scroller/graphicsview
 INSTALLS += target sources
 QT += widgets
diff --git a/examples/widgets/scroller/scroller.pro b/examples/widgets/scroller/scroller.pro
index ef7671f6b0..bf4c64be6b 100644
--- a/examples/widgets/scroller/scroller.pro
+++ b/examples/widgets/scroller/scroller.pro
@@ -3,5 +3,5 @@ SUBDIRS +=  graphicsview
 
 # install
 sources.files = scroller.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scroller
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/scroller
 INSTALLS += sources
diff --git a/examples/widgets/statemachine/eventtransitions/eventtransitions.pro b/examples/widgets/statemachine/eventtransitions/eventtransitions.pro
index 36bfe8e6fb..e6d6633de6 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/widgets/statemachine/eventtransitions
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/eventtransitions
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS eventtransitions.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/eventtransitions
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 6c831ea2cb..cb3900dbb6 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/widgets/statemachine/factorial
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/factorial
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS factorial.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/factorial
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/factorial
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/statemachine/pingpong/pingpong.pro b/examples/widgets/statemachine/pingpong/pingpong.pro
index b99060de75..b0d90d1a91 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/widgets/statemachine/pingpong
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/pingpong
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pingpong.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/pingpong
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/pingpong
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/statemachine/rogue/rogue.pro b/examples/widgets/statemachine/rogue/rogue.pro
index 32888d8390..a2cbe16aa1 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/widgets/statemachine/rogue
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/rogue
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/rogue
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/rogue
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/statemachine/statemachine.pro b/examples/widgets/statemachine/statemachine.pro
index 2a2d3b90ca..cc471e731f 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/widgets/statemachine
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS statemachine.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine
 INSTALLS += target sources
diff --git a/examples/widgets/statemachine/trafficlight/trafficlight.pro b/examples/widgets/statemachine/trafficlight/trafficlight.pro
index 776da71c54..0b61879e55 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/widgets/statemachine/trafficlight
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/trafficlight
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS trafficlight.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/trafficlight
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 d1d822c330..46626d36de 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/widgets/statemachine/twowaybutton
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/twowaybutton
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS twowaybutton.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/statemachine/twowaybutton
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 6192269e07..8db6a819a8 100644
--- a/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro
+++ b/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro
@@ -2,9 +2,9 @@ TEMPLATE  = subdirs
 SUBDIRS   = part1 part2 part3 part4 part5 part6 part7
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook-fr.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part1/part1.pro b/examples/widgets/tutorials/addressbook-fr/part1/part1.pro
index 305228ea23..08a870a77e 100644
--- a/examples/widgets/tutorials/addressbook-fr/part1/part1.pro
+++ b/examples/widgets/tutorials/addressbook-fr/part1/part1.pro
@@ -5,9 +5,9 @@ HEADERS   = addressbook.h
 QMAKE_PROJECT_NAME = abfr_part1
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part1
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part1
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part1
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part1
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part2/part2.pro b/examples/widgets/tutorials/addressbook-fr/part2/part2.pro
index 201df064cc..34408264c2 100644
--- a/examples/widgets/tutorials/addressbook-fr/part2/part2.pro
+++ b/examples/widgets/tutorials/addressbook-fr/part2/part2.pro
@@ -5,9 +5,9 @@ HEADERS   = addressbook.h
 QMAKE_PROJECT_NAME = abfr_part2
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part2
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part2
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part2
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part3/part3.pro b/examples/widgets/tutorials/addressbook-fr/part3/part3.pro
index ee113c0f9c..a2fb6c5fca 100644
--- a/examples/widgets/tutorials/addressbook-fr/part3/part3.pro
+++ b/examples/widgets/tutorials/addressbook-fr/part3/part3.pro
@@ -5,9 +5,9 @@ HEADERS = addressbook.h
 QMAKE_PROJECT_NAME = abfr_part3
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part3
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part3
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part3
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part3
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part4/part4.pro b/examples/widgets/tutorials/addressbook-fr/part4/part4.pro
index 7055121460..68705fc807 100644
--- a/examples/widgets/tutorials/addressbook-fr/part4/part4.pro
+++ b/examples/widgets/tutorials/addressbook-fr/part4/part4.pro
@@ -5,9 +5,9 @@ HEADERS = addressbook.h
 QMAKE_PROJECT_NAME = abfr_part4
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part4
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part4
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part4
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part4
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part5/part5.pro b/examples/widgets/tutorials/addressbook-fr/part5/part5.pro
index 2066e93a5b..fcaf3fc66f 100644
--- a/examples/widgets/tutorials/addressbook-fr/part5/part5.pro
+++ b/examples/widgets/tutorials/addressbook-fr/part5/part5.pro
@@ -7,9 +7,9 @@ HEADERS   = addressbook.h \
 QMAKE_PROJECT_NAME = abfr_part5
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part5
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part5
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part5
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part5
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part6/part6.pro b/examples/widgets/tutorials/addressbook-fr/part6/part6.pro
index 6541eb6cfa..34bcb8f8fc 100644
--- a/examples/widgets/tutorials/addressbook-fr/part6/part6.pro
+++ b/examples/widgets/tutorials/addressbook-fr/part6/part6.pro
@@ -7,9 +7,9 @@ HEADERS   = addressbook.h \
 QMAKE_PROJECT_NAME = abfr_part6
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part6
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part6
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part6
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part6
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part7/part7.pro b/examples/widgets/tutorials/addressbook-fr/part7/part7.pro
index ab1e7ad594..e0981a7da9 100644
--- a/examples/widgets/tutorials/addressbook-fr/part7/part7.pro
+++ b/examples/widgets/tutorials/addressbook-fr/part7/part7.pro
@@ -7,9 +7,9 @@ HEADERS   = addressbook.h \
 QMAKE_PROJECT_NAME = abfr_part7
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part7
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part7
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook-fr/part7
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part7
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/addressbook/addressbook.pro b/examples/widgets/tutorials/addressbook/addressbook.pro
index 4e26f48af9..80bc073e71 100644
--- a/examples/widgets/tutorials/addressbook/addressbook.pro
+++ b/examples/widgets/tutorials/addressbook/addressbook.pro
@@ -2,9 +2,9 @@ TEMPLATE  = subdirs
 SUBDIRS   = part1 part2 part3 part4 part5 part6 part7
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/addressbook/part1/part1.pro b/examples/widgets/tutorials/addressbook/part1/part1.pro
index c44a048797..e8722df318 100644
--- a/examples/widgets/tutorials/addressbook/part1/part1.pro
+++ b/examples/widgets/tutorials/addressbook/part1/part1.pro
@@ -5,9 +5,9 @@ HEADERS   = addressbook.h
 QMAKE_PROJECT_NAME = ab_part1
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part1
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part1
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part1
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part1
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/addressbook/part2/part2.pro b/examples/widgets/tutorials/addressbook/part2/part2.pro
index ae95f6fab7..65247f3e61 100644
--- a/examples/widgets/tutorials/addressbook/part2/part2.pro
+++ b/examples/widgets/tutorials/addressbook/part2/part2.pro
@@ -5,9 +5,9 @@ HEADERS   = addressbook.h
 QMAKE_PROJECT_NAME = ab_part2
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part2
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part2
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part2
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/addressbook/part3/part3.pro b/examples/widgets/tutorials/addressbook/part3/part3.pro
index 6809a9e27a..79cf2da551 100644
--- a/examples/widgets/tutorials/addressbook/part3/part3.pro
+++ b/examples/widgets/tutorials/addressbook/part3/part3.pro
@@ -5,9 +5,9 @@ HEADERS = addressbook.h
 QMAKE_PROJECT_NAME = ab_part3
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part3
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part3
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part3
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part3
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/addressbook/part4/part4.pro b/examples/widgets/tutorials/addressbook/part4/part4.pro
index 82b2624069..61ceb90802 100644
--- a/examples/widgets/tutorials/addressbook/part4/part4.pro
+++ b/examples/widgets/tutorials/addressbook/part4/part4.pro
@@ -5,9 +5,9 @@ HEADERS = addressbook.h
 QMAKE_PROJECT_NAME = ab_part4
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part4
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part4
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part4
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part4
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/addressbook/part5/part5.pro b/examples/widgets/tutorials/addressbook/part5/part5.pro
index b12fcac50a..8f42a07025 100644
--- a/examples/widgets/tutorials/addressbook/part5/part5.pro
+++ b/examples/widgets/tutorials/addressbook/part5/part5.pro
@@ -7,9 +7,9 @@ HEADERS   = addressbook.h \
 QMAKE_PROJECT_NAME = ab_part5
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part5
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part5
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part5
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part5
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/addressbook/part6/part6.pro b/examples/widgets/tutorials/addressbook/part6/part6.pro
index 91672e7bfa..f7a958cf97 100644
--- a/examples/widgets/tutorials/addressbook/part6/part6.pro
+++ b/examples/widgets/tutorials/addressbook/part6/part6.pro
@@ -7,9 +7,9 @@ HEADERS   = addressbook.h \
 QMAKE_PROJECT_NAME = ab_part6
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part6
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part6
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part6
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part6
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/addressbook/part7/part7.pro b/examples/widgets/tutorials/addressbook/part7/part7.pro
index fcb5c37060..90fc0ca229 100644
--- a/examples/widgets/tutorials/addressbook/part7/part7.pro
+++ b/examples/widgets/tutorials/addressbook/part7/part7.pro
@@ -7,9 +7,9 @@ HEADERS   = addressbook.h \
 QMAKE_PROJECT_NAME = ab_part7
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part7
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part7
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/addressbook/part7
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part7
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/gettingStarted/gettingStarted.pro b/examples/widgets/tutorials/gettingStarted/gettingStarted.pro
index 4b1ac2456d..98a834f5f6 100644
--- a/examples/widgets/tutorials/gettingStarted/gettingStarted.pro
+++ b/examples/widgets/tutorials/gettingStarted/gettingStarted.pro
@@ -6,5 +6,5 @@ dir_gsqt.file = gsQt/gsqt.pro
 
 # install
 sources.files = gettingStarted.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted
 INSTALLS += sources
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro b/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro
index 6866ba9581..4a0604fc3f 100644
--- a/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro
@@ -8,7 +8,7 @@ SUBDIRS = part1 \
 
 # install
 sources.files = *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt
 INSTALLS += sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro
index 199c24b681..e6eb0d45f2 100644
--- a/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro
@@ -3,8 +3,8 @@ QT += widgets
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part1
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part1
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part1
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part1
 INSTALLS += target sources
 
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro
index be220d37a3..c3f30e5810 100644
--- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro
@@ -3,8 +3,8 @@ QT += widgets
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part2
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part2
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part2
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part2
 INSTALLS += target sources
 
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro
index 88f1b9817e..f51e531cbd 100644
--- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro
@@ -3,8 +3,8 @@ QT += widgets
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part3
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part3
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part3
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part3
 INSTALLS += target sources
 
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro
index d88f722111..5221bda09d 100644
--- a/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro
@@ -3,8 +3,8 @@ QT += widgets
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part4
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part4
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part4
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part4
 INSTALLS += target sources
 
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro
index 84fdf940e8..a3687aa4b2 100644
--- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro
@@ -3,8 +3,8 @@ QT += widgets
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part5
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part5
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/gettingStarted/gsQt/part5
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part5
 INSTALLS += target sources
 
diff --git a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro
index 4f2a38d6db..4aa8ed1039 100644
--- a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro
+++ b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro
@@ -9,9 +9,9 @@ HEADERS += mymodel.h
 
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/1_readonly
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/1_readonly
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 1_readonly.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/1_readonly
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/1_readonly
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro
index 8032ceedac..668b2570cf 100644
--- a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro
+++ b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro
@@ -8,9 +8,9 @@ SOURCES += main.cpp \
 HEADERS += mymodel.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/2_formatting
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/2_formatting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2_formatting.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/2_formatting
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/2_formatting
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro
index 2fb5d25c01..8993d7149b 100644
--- a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro
+++ b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro
@@ -8,9 +8,9 @@ SOURCES += main.cpp \
 HEADERS += mymodel.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/3_changingmodel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/3_changingmodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 3_changingmodel.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/3_changingmodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/3_changingmodel
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro
index 7ae2eedfda..a343b63fdb 100644
--- a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro
+++ b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro
@@ -8,9 +8,9 @@ SOURCES += main.cpp  \
 HEADERS += mymodel.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/4_headers
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/4_headers
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 4_headers.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/4_headers
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/4_headers
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro
index d67d151dd6..cea272439e 100644
--- a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro
+++ b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro
@@ -10,9 +10,9 @@ HEADERS += mainwindow.h \
            mymodel.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/5_edit
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/5_edit
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 5_edit.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/5_edit
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/5_edit
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro
index 8ed6cf2b20..1e35d6cd67 100644
--- a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro
+++ b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro
@@ -5,9 +5,9 @@ SOURCES += main.cpp \
 HEADERS += mainwindow.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/6_treeview
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/6_treeview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 6_treeview.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/6_treeview
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/6_treeview
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro
index 1865700e78..f3eaac0a7d 100644
--- a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro
+++ b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro
@@ -5,9 +5,9 @@ SOURCES += main.cpp \
 HEADERS += mainwindow.h 
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/7_selections
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/7_selections
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 7_selections.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview/7_selections
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/7_selections
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/modelview/modelview.pro b/examples/widgets/tutorials/modelview/modelview.pro
index c335d185e2..2d6460fc4d 100644
--- a/examples/widgets/tutorials/modelview/modelview.pro
+++ b/examples/widgets/tutorials/modelview/modelview.pro
@@ -8,9 +8,9 @@ SUBDIRS = 1_readonly \
           7_selections
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS modelview.pro 
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/modelview
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/threads/clock/clock.pro b/examples/widgets/tutorials/threads/clock/clock.pro
index 973836d468..833781b36a 100644
--- a/examples/widgets/tutorials/threads/clock/clock.pro
+++ b/examples/widgets/tutorials/threads/clock/clock.pro
@@ -5,9 +5,9 @@ SOURCES += main.cpp \
 HEADERS += clockthread.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/clock
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/clock
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS clock.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/clock
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/clock
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro b/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro
index b6e87acf88..794c095aa0 100644
--- a/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro
+++ b/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro
@@ -7,9 +7,9 @@ TEMPLATE = app
 SOURCES += helloconcurrent.cpp 
    
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/helloconcurrent
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/helloconcurrent
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloconcurrent.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/helloconcurrent
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/helloconcurrent
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/tutorials/threads/hellothread/hellothread.pro b/examples/widgets/tutorials/threads/hellothread/hellothread.pro
index 291dbf156d..8bc14d09c3 100644
--- a/examples/widgets/tutorials/threads/hellothread/hellothread.pro
+++ b/examples/widgets/tutorials/threads/hellothread/hellothread.pro
@@ -8,9 +8,9 @@ SOURCES += main.cpp \
 HEADERS += hellothread.h 
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothread
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothread
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothread.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothread
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothread
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro b/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro
index c9afbe0265..6e60fd14bc 100644
--- a/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro
+++ b/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro
@@ -6,9 +6,9 @@ TEMPLATE = app
 SOURCES += hellothreadpool.cpp 
    
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothreadpool
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothreadpool
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothreadpool.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/hellothreadpool
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothreadpool
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/tutorials/threads/movedobject/movedobject.pro b/examples/widgets/tutorials/threads/movedobject/movedobject.pro
index 384c3528f6..5037b37369 100644
--- a/examples/widgets/tutorials/threads/movedobject/movedobject.pro
+++ b/examples/widgets/tutorials/threads/movedobject/movedobject.pro
@@ -10,9 +10,9 @@ HEADERS += \
     thread.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/movedobject
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/movedobject
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS movedobject.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads/movedobject
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/movedobject
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/tutorials/threads/threads.pro b/examples/widgets/tutorials/threads/threads.pro
index f7bd4df0e8..fd26fae6f7 100644
--- a/examples/widgets/tutorials/threads/threads.pro
+++ b/examples/widgets/tutorials/threads/threads.pro
@@ -11,5 +11,5 @@ QT += widgets
 
 # install
 sources.files = threads.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/threads
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads
 INSTALLS += sources
diff --git a/examples/widgets/tutorials/tutorials.pro b/examples/widgets/tutorials/tutorials.pro
index 3a7cf8f9d6..144dffa631 100644
--- a/examples/widgets/tutorials/tutorials.pro
+++ b/examples/widgets/tutorials/tutorials.pro
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
 SUBDIRS +=  addressbook-fr threads addressbook widgets modelview gettingStarted
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials
 sources.files = tutorials.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials
 INSTALLS += target sources
diff --git a/examples/widgets/tutorials/widgets/childwidget/childwidget.pro b/examples/widgets/tutorials/widgets/childwidget/childwidget.pro
index c95a2f53cd..6f04e9582e 100644
--- a/examples/widgets/tutorials/widgets/childwidget/childwidget.pro
+++ b/examples/widgets/tutorials/widgets/childwidget/childwidget.pro
@@ -1,9 +1,9 @@
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/childwidget
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/childwidget
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS childwidget.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/childwidget
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/childwidget
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro
index 9c7dc95edd..2655559435 100644
--- a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro
+++ b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro
@@ -1,9 +1,9 @@
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/nestedlayouts
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/nestedlayouts
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS nestedlayouts.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/nestedlayouts
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/nestedlayouts
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/widgets/toplevel/toplevel.pro b/examples/widgets/tutorials/widgets/toplevel/toplevel.pro
index 7bcb4d5491..fd2506612c 100644
--- a/examples/widgets/tutorials/widgets/toplevel/toplevel.pro
+++ b/examples/widgets/tutorials/widgets/toplevel/toplevel.pro
@@ -1,9 +1,9 @@
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/toplevel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/toplevel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS toplevel.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/toplevel
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/toplevel
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/tutorials/widgets/widgets.pro b/examples/widgets/tutorials/widgets/widgets.pro
index bb83f3f690..318453e5a7 100644
--- a/examples/widgets/tutorials/widgets/widgets.pro
+++ b/examples/widgets/tutorials/widgets/widgets.pro
@@ -2,8 +2,8 @@ TEMPLATE  = subdirs
 SUBDIRS   = toplevel childwidget windowlayout nestedlayouts
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS widgets.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets
 INSTALLS += target sources
 QT += widgets
diff --git a/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro b/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro
index 770c34c4ad..d87f7780f1 100644
--- a/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro
+++ b/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro
@@ -1,9 +1,9 @@
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/windowlayout
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/windowlayout
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowlayout.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tutorials/widgets/windowlayout
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/windowlayout
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro
index cbfba273ed..4f527b1540 100644
--- a/examples/widgets/widgets.pro
+++ b/examples/widgets/widgets.pro
@@ -22,5 +22,5 @@ contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
 
 # install
 sources.files = *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ee7186dd8c..d238849403 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/widgets/analogclock
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/analogclock
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS analogclock.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/analogclock
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 9f0a5002d1..7e6cb7b10c 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/widgets/applicationicon
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/applicationicon
 sources.files = $$SOURCES $$HEADERS applicationicon.svg applicationicon.png *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/applicationicon
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/applicationicon
 INSTALLS += target sources
diff --git a/examples/widgets/widgets/calculator/calculator.pro b/examples/widgets/widgets/calculator/calculator.pro
index 68ec72400e..d9cfe3733f 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/widgets/calculator
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/calculator
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calculator.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/calculator
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 d3890a9b71..20768295e6 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/widgets/calendarwidget
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/calendarwidget
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendarwidget.pro resources
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/calendarwidget
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 dab67c5a3d..6cb004ebbf 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/widgets/charactermap
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/charactermap
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS charactermap.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/charactermap
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ee861e8dfa..89e733351b 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/widgets/codeeditor
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/codeeditor
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/codeeditor
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 1f79fcba76..a6771ee51c 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/widgets/digitalclock
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/digitalclock
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS digitalclock.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/digitalclock
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 d360c3f6ed..08e16cb7c2 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/widgets/elidedlabel
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/elidedlabel
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/elidedlabel
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/elidedlabel
 INSTALLS += target sources
diff --git a/examples/widgets/widgets/groupbox/groupbox.pro b/examples/widgets/widgets/groupbox/groupbox.pro
index 8787c7d7f9..c5069f3627 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/widgets/groupbox
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/groupbox
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS groupbox.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/groupbox
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ca22d65bcb..150808b310 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/widgets/icons
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/icons
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS icons.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/icons
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/icons
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.pro b/examples/widgets/widgets/imageviewer/imageviewer.pro
index b66ccf382d..ec28f926e1 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/widgets/imageviewer
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS imageviewer.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/imageviewer
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/widgets/lineedits/lineedits.pro b/examples/widgets/widgets/lineedits/lineedits.pro
index 8d16866ebf..4dadabc730 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/widgets/lineedits
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/lineedits
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lineedits.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/lineedits
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 8b3bea1ae7..f339e9b082 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/widgets/mousebuttons
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/mousebuttons
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mousebuttons.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/mousebuttons
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 81ae2243c5..135d8d33e3 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/widgets/movie
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/movie
 sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro animation.gif
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/movie
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/movie
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/widgets/orientation/orientation.pro b/examples/widgets/widgets/orientation/orientation.pro
index 89786bec7d..50cdf79781 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/widgets/orientation
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/orientation
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/orientation
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 eaed4679f1..7e910921cb 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/widgets/scribble
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/scribble
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS scribble.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/scribble
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 a83f8b80d5..bdb8593afb 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/widgets/shapedclock
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/shapedclock
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS shapedclock.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/shapedclock
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 0ef1a0eed2..510b0e842d 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/widgets/sliders
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/sliders
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sliders.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/sliders
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 b425882bf2..0b5b198cfe 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/widgets/spinboxes
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/spinboxes
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spinboxes.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/spinboxes
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 7fa0a4d7cd..b05e832ede 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/widgets/styles
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/styles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styles.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/styles
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 da5c388fbf..92d5c5ebb2 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/widgets/stylesheet
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/stylesheet
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images layouts qss
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/stylesheet
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 5b0d4c1d84..97c3e9a8d4 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/widgets/tablet
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tablet
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tablet.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/tablet
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 59260fbc36..759dbb7bc8 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/widgets/tetrix
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tetrix
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tetrix.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/tetrix
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 e3e8520f8d..d226ffff12 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/widgets/tooltips
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tooltips
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tooltips.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/tooltips
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 561d70ab07..f56aa1e4f4 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/widgets/validators
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/validators
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/validators
+sources.path = $$[QT_INSTALL_EXAMPLES]/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 ec4d3af3bf..92f935454b 100644
--- a/examples/widgets/widgets/widgets.pro
+++ b/examples/widgets/widgets/widgets.pro
@@ -30,5 +30,5 @@ contains(styles, windows): SUBDIRS += styles
 
 # install
 sources.files = widgets.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets
 INSTALLS += sources
diff --git a/examples/widgets/widgets/wiggly/wiggly.pro b/examples/widgets/widgets/wiggly/wiggly.pro
index a7062fa7eb..9bdb76e40e 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/widgets/wiggly
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/wiggly
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wiggly.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/wiggly
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/wiggly
 INSTALLS += target sources
diff --git a/examples/widgets/widgets/windowflags/windowflags.pro b/examples/widgets/widgets/windowflags/windowflags.pro
index c98b7a8b9a..a1ea42fd5d 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/widgets/windowflags
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/windowflags
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowflags.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/widgets/windowflags
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/windowflags
 INSTALLS += target sources
 
 QT += widgets
author	hjk <qthjk@ovi.com>	2012-11-26 14:04:31 +0100
committer	The Qt Project <gerrit-noreply@qt-project.org>	2012-11-26 14:35:23 +0100
commit	c527dd44be9cee5da06ce397f89e3a2595d4ed37 (patch)
tree	05d6d59ff9439832735ba3ee429acb7be3994af0 /examples/widgets
parent	b34c48d95bf94f787fe693e28126e37a4bb485c1 (diff)