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 <[email protected]>
author: hjk <[email protected]> 2012-11-26 14:04:31 +0100
committer: The Qt Project <[email protected]> 2012-11-26 14:35:23 +0100
commit: c527dd44be9cee5da06ce397f89e3a2595d4ed37 (patch)
tree: 05d6d59ff9439832735ba3ee429acb7be3994af0
parent: b34c48d95bf94f787fe693e28126e37a4bb485c1 (diff)
301 files changed, 586 insertions, 586 deletions
diff --git a/examples/dbus/complexpingpong/complexping.pro b/examples/dbus/complexpingpong/complexping.pro
index 6f6f21abc17..0f9f37044f1 100644
--- a/examples/dbus/complexpingpong/complexping.pro
+++ b/examples/dbus/complexpingpong/complexping.pro
@@ -4,9 +4,9 @@ QT += dbus
 HEADERS += complexping.h ping-common.h
 SOURCES += complexping.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/complexpingpong/complexpong.pro b/examples/dbus/complexpingpong/complexpong.pro
index 08759bb8d78..dede78026a5 100644
--- a/examples/dbus/complexpingpong/complexpong.pro
+++ b/examples/dbus/complexpingpong/complexpong.pro
@@ -4,9 +4,9 @@ QT += dbus
 HEADERS += complexpong.h
 SOURCES += complexpong.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/dbus-chat/dbus-chat.pro b/examples/dbus/dbus-chat/dbus-chat.pro
index e539228ba18..5c784058044 100644
--- a/examples/dbus/dbus-chat/dbus-chat.pro
+++ b/examples/dbus/dbus-chat/dbus-chat.pro
@@ -8,9 +8,9 @@ DBUS_ADAPTORS += org.example.chat.xml
 DBUS_INTERFACES += org.example.chat.xml
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/chat
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/dbus-chat
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/dbus-chat
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro
index a6a0ded836b..1167421561a 100644
--- a/examples/dbus/dbus.pro
+++ b/examples/dbus/dbus.pro
@@ -9,9 +9,9 @@ SUBDIRS = listnames \
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus
 sources.files = *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus
 INSTALLS += sources
 
 QT += widgets
diff --git a/examples/dbus/listnames/listnames.pro b/examples/dbus/listnames/listnames.pro
index 514fc02e169..307036c4aa9 100644
--- a/examples/dbus/listnames/listnames.pro
+++ b/examples/dbus/listnames/listnames.pro
@@ -4,9 +4,9 @@ win32:CONFIG += console
 
 SOURCES += listnames.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/pingpong/ping.pro b/examples/dbus/pingpong/ping.pro
index 00e764df390..448a2b41e4d 100644
--- a/examples/dbus/pingpong/ping.pro
+++ b/examples/dbus/pingpong/ping.pro
@@ -4,9 +4,9 @@ QT += dbus
 HEADERS += ping-common.h
 SOURCES += ping.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/pingpong/pong.pro b/examples/dbus/pingpong/pong.pro
index 3ba21718ff4..046d6f07b69 100644
--- a/examples/dbus/pingpong/pong.pro
+++ b/examples/dbus/pingpong/pong.pro
@@ -4,9 +4,9 @@ QT += dbus
 HEADERS += ping-common.h pong.h
 SOURCES += pong.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro
index 46a4eaa1390..e8a4f9e01f2 100644
--- a/examples/dbus/remotecontrolledcar/car/car.pro
+++ b/examples/dbus/remotecontrolledcar/car/car.pro
@@ -5,9 +5,9 @@ HEADERS += car.h
 SOURCES += car.cpp main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro
index 5ee37bec715..d6bbd9c8eee 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.pro
+++ b/examples/dbus/remotecontrolledcar/controller/controller.pro
@@ -6,9 +6,9 @@ HEADERS += controller.h
 SOURCES += main.cpp controller.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller
+target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
index 2638f917d67..519b9b01573 100644
--- a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
+++ b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
@@ -4,7 +4,7 @@ SUBDIRS = car \
 
 # install
 sources.files = *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar
+sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar
 INSTALLS += sources
 
 QT += widgets
diff --git a/examples/embedded/digiflip/digiflip.pro b/examples/embedded/digiflip/digiflip.pro
index f948b0796f8..dc8ac9abbb6 100644
--- a/examples/embedded/digiflip/digiflip.pro
+++ b/examples/embedded/digiflip/digiflip.pro
@@ -2,7 +2,7 @@ QT += widgets
 
 SOURCES = digiflip.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip
+target.path = $$[QT_INSTALL_EXAMPLES]/embedded/digiflip
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip
+sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/digiflip
 INSTALLS += target sources
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
index fbdfe2e9088..70b5fa003b3 100644
--- a/examples/embedded/embedded.pro
+++ b/examples/embedded/embedded.pro
@@ -6,7 +6,7 @@ SUBDIRS += flightinfo
 
 # install
 sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded
+sources.path = $$[QT_INSTALL_EXAMPLES]/embedded
 INSTALLS += sources
 
 QT += widgets widgets
diff --git a/examples/embedded/flickable/flickable.pro b/examples/embedded/flickable/flickable.pro
index 82b39acce10..67886bc2071 100644
--- a/examples/embedded/flickable/flickable.pro
+++ b/examples/embedded/flickable/flickable.pro
@@ -1,8 +1,8 @@
 SOURCES = flickable.cpp main.cpp
 HEADERS = flickable.h
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable
+target.path = $$[QT_INSTALL_EXAMPLES]/embedded/flickable
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable
+sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/flickable
 INSTALLS += target sources
 QT += widgets widgets
diff --git a/examples/embedded/flightinfo/flightinfo.pro b/examples/embedded/flightinfo/flightinfo.pro
index a7a4fcec5af..51ae783eb58 100644
--- a/examples/embedded/flightinfo/flightinfo.pro
+++ b/examples/embedded/flightinfo/flightinfo.pro
@@ -5,7 +5,7 @@ FORMS += form.ui
 RESOURCES = flightinfo.qrc
 QT += network widgets
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo
+target.path = $$[QT_INSTALL_EXAMPLES]/embedded/flightinfo
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo
+sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/flightinfo
 INSTALLS += target sources
diff --git a/examples/embedded/lightmaps/lightmaps.pro b/examples/embedded/lightmaps/lightmaps.pro
index 92ef6b9410d..272488a85f1 100644
--- a/examples/embedded/lightmaps/lightmaps.pro
+++ b/examples/embedded/lightmaps/lightmaps.pro
@@ -8,7 +8,7 @@ SOURCES   = lightmaps.cpp \
             slippymap.cpp
 QT += network widgets
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps
+target.path = $$[QT_INSTALL_EXAMPLES]/embedded/lightmaps
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps
+sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/lightmaps
 INSTALLS += target sources
diff --git a/examples/embedded/raycasting/raycasting.pro b/examples/embedded/raycasting/raycasting.pro
index 9c562d446ce..770e97318db 100644
--- a/examples/embedded/raycasting/raycasting.pro
+++ b/examples/embedded/raycasting/raycasting.pro
@@ -2,8 +2,8 @@ TEMPLATE = app
 SOURCES = raycasting.cpp
 RESOURCES += raycasting.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting
+target.path = $$[QT_INSTALL_EXAMPLES]/embedded/raycasting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting
+sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/raycasting
 INSTALLS += target sources
 QT += widgets widgets
diff --git a/examples/embedded/styleexample/styleexample.pro b/examples/embedded/styleexample/styleexample.pro
index a0fd001cf9d..e0e888e555d 100644
--- a/examples/embedded/styleexample/styleexample.pro
+++ b/examples/embedded/styleexample/styleexample.pro
@@ -5,7 +5,7 @@ FORMS += stylewidget.ui
 SOURCES += main.cpp stylewidget.cpp
 RESOURCES += styleexample.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample
+target.path = $$[QT_INSTALL_EXAMPLES]/embedded/styleexample
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample
+sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/styleexample
 INSTALLS += target sources
diff --git a/examples/gestures/gestures.pro b/examples/gestures/gestures.pro
index b354ec46458..a0068f9235c 100644
--- a/examples/gestures/gestures.pro
+++ b/examples/gestures/gestures.pro
@@ -4,8 +4,8 @@ SUBDIRS       = \
               imagegestures
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/gestures
+target.path = $$[QT_INSTALL_EXAMPLES]/gestures
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS gestures.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/gestures
+sources.path = $$[QT_INSTALL_EXAMPLES]/gestures
 INSTALLS += target sources
 QT += widgets
diff --git a/examples/gestures/imagegestures/imagegestures.pro b/examples/gestures/imagegestures/imagegestures.pro
index 70825adf12f..8b5c0632ba2 100644
--- a/examples/gestures/imagegestures/imagegestures.pro
+++ b/examples/gestures/imagegestures/imagegestures.pro
@@ -5,13 +5,13 @@ SOURCES   = imagewidget.cpp \
             mainwidget.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/gestures/imagegestures
+target.path = $$[QT_INSTALL_EXAMPLES]/gestures/imagegestures
 sources.files = $$SOURCES \
     $$HEADERS \
     $$RESOURCES \
     $$FORMS \
     imagegestures.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/gestures/imagegestures
+sources.path = $$[QT_INSTALL_EXAMPLES]/gestures/imagegestures
 INSTALLS += target \
     sources
 
diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro
index d7b4fbb28ef..c62402e3384 100644
--- a/examples/ipc/ipc.pro
+++ b/examples/ipc/ipc.pro
@@ -5,7 +5,7 @@ TEMPLATE      = subdirs
 
 # install
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ipc.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc
+sources.path = $$[QT_INSTALL_EXAMPLES]/ipc
 INSTALLS += sources
 
 QT += widgets
diff --git a/examples/ipc/localfortuneclient/localfortuneclient.pro b/examples/ipc/localfortuneclient/localfortuneclient.pro
index ee46a06bfbf..43aa68f1836 100644
--- a/examples/ipc/localfortuneclient/localfortuneclient.pro
+++ b/examples/ipc/localfortuneclient/localfortuneclient.pro
@@ -4,9 +4,9 @@ SOURCES       = client.cpp \
 QT           += network widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneclient
+target.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneclient
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneclient.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneclient
+sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneclient
 INSTALLS += target sources
 
 
diff --git a/examples/ipc/localfortuneserver/localfortuneserver.pro b/examples/ipc/localfortuneserver/localfortuneserver.pro
index 4deda4571c4..973535adf03 100644
--- a/examples/ipc/localfortuneserver/localfortuneserver.pro
+++ b/examples/ipc/localfortuneserver/localfortuneserver.pro
@@ -4,9 +4,9 @@ SOURCES       = server.cpp \
 QT           += network widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneserver
+target.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneserver
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneserver.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneserver
+sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneserver
 INSTALLS += target sources
 
 
diff --git a/examples/ipc/sharedmemory/sharedmemory.pro b/examples/ipc/sharedmemory/sharedmemory.pro
index d11e16e4c67..2bcef9fc0d3 100644
--- a/examples/ipc/sharedmemory/sharedmemory.pro
+++ b/examples/ipc/sharedmemory/sharedmemory.pro
@@ -7,9 +7,9 @@ HEADERS += dialog.h
 FORMS += dialog.ui
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/sharedmemory
+target.path = $$[QT_INSTALL_EXAMPLES]/ipc/sharedmemory
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/sharedmemory
+sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/sharedmemory
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/ja_JP/linguist/hellotr/hellotr.pro b/examples/ja_JP/linguist/hellotr/hellotr.pro
index b7dd21514a8..e6e1442665c 100644
--- a/examples/ja_JP/linguist/hellotr/hellotr.pro
+++ b/examples/ja_JP/linguist/hellotr/hellotr.pro
@@ -5,9 +5,9 @@ TRANSLATIONS = hellotr_ja.ts
 #! [1]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr
+sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/linguist/arrowpad/arrowpad.pro b/examples/linguist/arrowpad/arrowpad.pro
index a8975874734..c4aab2c2a9a 100644
--- a/examples/linguist/arrowpad/arrowpad.pro
+++ b/examples/linguist/arrowpad/arrowpad.pro
@@ -10,9 +10,9 @@ TRANSLATIONS = arrowpad_fr.ts \
 #! [1]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/arrowpad
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/arrowpad
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/arrowpad
+sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/arrowpad
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/linguist/hellotr/hellotr.pro b/examples/linguist/hellotr/hellotr.pro
index 0cd06995fe1..cc5a6557b64 100644
--- a/examples/linguist/hellotr/hellotr.pro
+++ b/examples/linguist/hellotr/hellotr.pro
@@ -5,9 +5,9 @@ TRANSLATIONS = hellotr_la.ts
 #! [1]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr
+sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/linguist/linguist.pro b/examples/linguist/linguist.pro
index aa50f03be5f..2b199fc54bd 100644
--- a/examples/linguist/linguist.pro
+++ b/examples/linguist/linguist.pro
@@ -5,7 +5,7 @@ SUBDIRS       = arrowpad \
 
 # install
 sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist
+sources.path = $$[QT_INSTALL_EXAMPLES]/linguist
 INSTALLS += sources
 
 QT += widgets
diff --git a/examples/linguist/trollprint/trollprint.pro b/examples/linguist/trollprint/trollprint.pro
index 5c7d7ffc0f8..c2300ce55c8 100644
--- a/examples/linguist/trollprint/trollprint.pro
+++ b/examples/linguist/trollprint/trollprint.pro
@@ -6,9 +6,9 @@ SOURCES       = main.cpp \
 TRANSLATIONS  = trollprint_pt.ts
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/trollprint
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/trollprint
 sources.files = $$SOURCES $$HEADERS $$TRANSLATIONS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/trollprint
+sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/trollprint
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index e45cb6334b6..2ec47ee2c7a 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -18,7 +18,7 @@ wince*:LIBS += -lws2
 CONFIG += console
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/bearermonitor
+target.path = $$[QT_INSTALL_EXAMPLES]/network/bearermonitor
 sources.files = $$SOURCES $$HEADERS *.ui *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/bearermonitor
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/bearermonitor
 INSTALLS += target sources
diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.pro b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
index c8689b39fb3..bfe4162b2b4 100644
--- a/examples/network/blockingfortuneclient/blockingfortuneclient.pro
+++ b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
@@ -8,8 +8,8 @@ SOURCES       = blockingclient.cpp \
 QT           += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/blockingfortuneclient
+target.path = $$[QT_INSTALL_EXAMPLES]/network/blockingfortuneclient
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blockingfortuneclient.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/blockingfortuneclient
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/blockingfortuneclient
 INSTALLS += target sources
 
diff --git a/examples/network/broadcastreceiver/broadcastreceiver.pro b/examples/network/broadcastreceiver/broadcastreceiver.pro
index 712da4931f0..b77369637be 100644
--- a/examples/network/broadcastreceiver/broadcastreceiver.pro
+++ b/examples/network/broadcastreceiver/broadcastreceiver.pro
@@ -6,8 +6,8 @@ SOURCES       = receiver.cpp \
 QT           += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastreceiver
+target.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastreceiver
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastreceiver.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastreceiver
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastreceiver
 INSTALLS += target sources
 
diff --git a/examples/network/broadcastsender/broadcastsender.pro b/examples/network/broadcastsender/broadcastsender.pro
index 40f173f3e76..c8e102b9775 100644
--- a/examples/network/broadcastsender/broadcastsender.pro
+++ b/examples/network/broadcastsender/broadcastsender.pro
@@ -6,7 +6,7 @@ SOURCES       = sender.cpp \
 QT           += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastsender
+target.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastsender
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastsender.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastsender
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastsender
 INSTALLS += target sources
diff --git a/examples/network/dnslookup/dnslookup.pro b/examples/network/dnslookup/dnslookup.pro
index 160666de7c4..9817080e440 100644
--- a/examples/network/dnslookup/dnslookup.pro
+++ b/examples/network/dnslookup/dnslookup.pro
@@ -6,7 +6,7 @@ HEADERS += dnslookup.h
 SOURCES += dnslookup.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/dnslookup
+target.path = $$[QT_INSTALL_EXAMPLES]/network/dnslookup
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/dnslookup
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/dnslookup
 INSTALLS += target sources
diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro
index 6c6d99379f0..8a55139b4cc 100644
--- a/examples/network/download/download.pro
+++ b/examples/network/download/download.pro
@@ -5,9 +5,9 @@ CONFIG -= app_bundle
 SOURCES += main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/download
+target.path = $$[QT_INSTALL_EXAMPLES]/network/download
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/download
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/download
 INSTALLS += target sources
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro
index f3e34861a18..45edf70574b 100644
--- a/examples/network/downloadmanager/downloadmanager.pro
+++ b/examples/network/downloadmanager/downloadmanager.pro
@@ -6,9 +6,9 @@ HEADERS += downloadmanager.h textprogressbar.h
 SOURCES += downloadmanager.cpp main.cpp textprogressbar.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/downloadmanager
+target.path = $$[QT_INSTALL_EXAMPLES]/network/downloadmanager
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/downloadmanager
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/downloadmanager
 INSTALLS += target sources
 
 OTHER_FILES += \
diff --git a/examples/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro
index b8d311b891f..3e359f73a4e 100644
--- a/examples/network/fortuneclient/fortuneclient.pro
+++ b/examples/network/fortuneclient/fortuneclient.pro
@@ -6,7 +6,7 @@ SOURCES       = client.cpp \
 QT           += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneclient
+target.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneclient
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneclient.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneclient
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneclient
 INSTALLS += target sources
diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro
index ac7e82f63ba..25ea93eaf14 100644
--- a/examples/network/fortuneserver/fortuneserver.pro
+++ b/examples/network/fortuneserver/fortuneserver.pro
@@ -6,7 +6,7 @@ SOURCES       = server.cpp \
 QT           += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneserver
+target.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneserver.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneserver
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver
 INSTALLS += target sources
diff --git a/examples/network/googlesuggest/googlesuggest.pro b/examples/network/googlesuggest/googlesuggest.pro
index b5ff5f16f10..9cbab551cf9 100644
--- a/examples/network/googlesuggest/googlesuggest.pro
+++ b/examples/network/googlesuggest/googlesuggest.pro
@@ -3,9 +3,9 @@ SOURCES =   main.cpp searchbox.cpp googlesuggest.cpp
 HEADERS  =  searchbox.h googlesuggest.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/googlesuggest
+target.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/googlesuggest
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest
 INSTALLS += target sources
 
 
diff --git a/examples/network/http/http.pro b/examples/network/http/http.pro
index 8349de46227..640cba97796 100644
--- a/examples/network/http/http.pro
+++ b/examples/network/http/http.pro
@@ -7,7 +7,7 @@ FORMS += authenticationdialog.ui
 QT += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/http
+target.path = $$[QT_INSTALL_EXAMPLES]/network/http
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS http.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/http
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/http
 INSTALLS += target sources
diff --git a/examples/network/loopback/loopback.pro b/examples/network/loopback/loopback.pro
index 760a366d54b..200ae119029 100644
--- a/examples/network/loopback/loopback.pro
+++ b/examples/network/loopback/loopback.pro
@@ -6,7 +6,7 @@ SOURCES       = dialog.cpp \
 QT           += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/loopback
+target.path = $$[QT_INSTALL_EXAMPLES]/network/loopback
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS loopback.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/loopback
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/loopback
 INSTALLS += target sources
diff --git a/examples/network/multicastreceiver/multicastreceiver.pro b/examples/network/multicastreceiver/multicastreceiver.pro
index 9f0ba09dc79..49cecb254aa 100644
--- a/examples/network/multicastreceiver/multicastreceiver.pro
+++ b/examples/network/multicastreceiver/multicastreceiver.pro
@@ -6,8 +6,8 @@ SOURCES       = receiver.cpp \
 QT           += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastreceiver
+target.path = $$[QT_INSTALL_EXAMPLES]/network/multicastreceiver
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastreceiver.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastreceiver
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/multicastreceiver
 INSTALLS += target sources
 
diff --git a/examples/network/multicastsender/multicastsender.pro b/examples/network/multicastsender/multicastsender.pro
index bc49b3eca37..a9e62474d74 100644
--- a/examples/network/multicastsender/multicastsender.pro
+++ b/examples/network/multicastsender/multicastsender.pro
@@ -4,8 +4,8 @@ SOURCES       = sender.cpp \
 QT           += network widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastsender
+target.path = $$[QT_INSTALL_EXAMPLES]/network/multicastsender
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastsender.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastsender
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/multicastsender
 INSTALLS += target sources
 
diff --git a/examples/network/network-chat/network-chat.pro b/examples/network/network-chat/network-chat.pro
index 49b32aa3561..17b31b58ff2 100644
--- a/examples/network/network-chat/network-chat.pro
+++ b/examples/network/network-chat/network-chat.pro
@@ -13,9 +13,9 @@ FORMS         = chatdialog.ui
 QT           += network widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/network-chat
+target.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network-chat.pro *.chat
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/network-chat
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat
 INSTALLS += target sources
 
 
diff --git a/examples/network/network.pro b/examples/network/network.pro
index 11f96ffdb7f..8d82c8ae879 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -30,5 +30,5 @@ SUBDIRS       = \
 
 # install
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network
+sources.path = $$[QT_INSTALL_EXAMPLES]/network
 INSTALLS += sources
diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro
index 39da4750af4..3dcecb92ba7 100644
--- a/examples/network/securesocketclient/securesocketclient.pro
+++ b/examples/network/securesocketclient/securesocketclient.pro
@@ -10,8 +10,8 @@ FORMS     += certificateinfo.ui \
 QT        += network widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/securesocketclient
+target.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.jpg images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/securesocketclient
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient
 INSTALLS += target sources
 
diff --git a/examples/network/threadedfortuneserver/threadedfortuneserver.pro b/examples/network/threadedfortuneserver/threadedfortuneserver.pro
index 8520ed43e43..ea0496843c1 100644
--- a/examples/network/threadedfortuneserver/threadedfortuneserver.pro
+++ b/examples/network/threadedfortuneserver/threadedfortuneserver.pro
@@ -10,9 +10,9 @@ SOURCES       = dialog.cpp \
 QT           += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/threadedfortuneserver
+target.path = $$[QT_INSTALL_EXAMPLES]/network/threadedfortuneserver
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threadedfortuneserver.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/threadedfortuneserver
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/threadedfortuneserver
 INSTALLS += target sources
 
 
diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro
index 36bc795faf3..118ea029299 100644
--- a/examples/network/torrent/torrent.pro
+++ b/examples/network/torrent/torrent.pro
@@ -32,10 +32,10 @@ RESOURCES += icons.qrc
 QT += network
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/torrent
+target.path = $$[QT_INSTALL_EXAMPLES]/network/torrent
 sources.files = $$SOURCES $$HEADERS $$RESOURCES torrent.pro *.torrent
 sources.files += icons forms 3rdparty
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/torrent
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/torrent
 INSTALLS += target sources
 
 
diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro
index d4812894513..0c981ce5053 100644
--- a/examples/opengl/2dpainting/2dpainting.pro
+++ b/examples/opengl/2dpainting/2dpainting.pro
@@ -11,9 +11,9 @@ SOURCES     = glwidget.cpp \
               window.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/2dpainting
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2dpainting.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/2dpainting
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting
 INSTALLS += target sources
 
 
diff --git a/examples/opengl/cube/cube.pro b/examples/opengl/cube/cube.pro
index ad84450d0bb..c904160d904 100644
--- a/examples/opengl/cube/cube.pro
+++ b/examples/opengl/cube/cube.pro
@@ -25,9 +25,9 @@ contains(QT_CONFIG, opengl) {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/cube
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/cube
 sources.files = $$SOURCES $$HEADERS $$RESOURCES cube.png *.glsl *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/cube
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/cube
 INSTALLS += target sources
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/opengl/framebufferobject2/framebufferobject2.pro b/examples/opengl/framebufferobject2/framebufferobject2.pro
index f835e88a687..073981b9f97 100644
--- a/examples/opengl/framebufferobject2/framebufferobject2.pro
+++ b/examples/opengl/framebufferobject2/framebufferobject2.pro
@@ -5,9 +5,9 @@ RESOURCES += framebufferobject2.qrc
 QT += opengl widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/framebufferobject2
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES framebufferobject2.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/framebufferobject2
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2
 INSTALLS += target sources
 
 
diff --git a/examples/opengl/grabber/grabber.pro b/examples/opengl/grabber/grabber.pro
index 6eebfdb738f..5267ccf0129 100644
--- a/examples/opengl/grabber/grabber.pro
+++ b/examples/opengl/grabber/grabber.pro
@@ -6,9 +6,9 @@ SOURCES       = glwidget.cpp \
 QT           += opengl widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/grabber
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grabber.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/grabber
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber
 INSTALLS += target sources
 
 
diff --git a/examples/opengl/hellogl/hellogl.pro b/examples/opengl/hellogl/hellogl.pro
index 7b61ef4b3b9..33e7c266c8e 100644
--- a/examples/opengl/hellogl/hellogl.pro
+++ b/examples/opengl/hellogl/hellogl.pro
@@ -11,9 +11,9 @@ SOURCES       = glwidget.cpp \
 QT           += opengl widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl
 INSTALLS += target sources
 
 
diff --git a/examples/opengl/hellogl_es/hellogl_es.pro b/examples/opengl/hellogl_es/hellogl_es.pro
index ca0a4bf4cdb..850e4e89949 100644
--- a/examples/opengl/hellogl_es/hellogl_es.pro
+++ b/examples/opengl/hellogl_es/hellogl_es.pro
@@ -7,7 +7,7 @@ HEADERS += glwindow.h
 
 RESOURCES += texture.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es
 INSTALLS += target sources
diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro
index 5a3d170df83..4195ce2e67f 100644
--- a/examples/opengl/hellogl_es2/hellogl_es2.pro
+++ b/examples/opengl/hellogl_es2/hellogl_es2.pro
@@ -12,9 +12,9 @@ HEADERS += bubble.h
 RESOURCES += texture.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es2
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es2
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2
 INSTALLS += target sources
 
 maemo5 {
diff --git a/examples/opengl/hellowindow/hellowindow.pro b/examples/opengl/hellowindow/hellowindow.pro
index b5ede1b83f5..cc199f4d4d6 100644
--- a/examples/opengl/hellowindow/hellowindow.pro
+++ b/examples/opengl/hellowindow/hellowindow.pro
@@ -4,8 +4,8 @@ HEADERS += hellowindow.h
 SOURCES += hellowindow.cpp main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellowindow
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellowindow
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellowindow.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellowindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellowindow
 INSTALLS += target sources
 
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
index 5b20a624747..387f8a0d75f 100644
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -26,9 +26,9 @@ SUBDIRS += hellowindow \
            paintedwindow
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/opengl/overpainting/overpainting.pro b/examples/opengl/overpainting/overpainting.pro
index 926024ad5b6..17ffbe6171c 100644
--- a/examples/opengl/overpainting/overpainting.pro
+++ b/examples/opengl/overpainting/overpainting.pro
@@ -11,13 +11,13 @@ SOURCES = bubble.cpp \
     qtlogo.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/overpainting
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting
 sources.files = $$SOURCES \
     $$HEADERS \
     $$RESOURCES \
     $$FORMS \
     overpainting.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/overpainting
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting
 INSTALLS += target \
     sources
 
diff --git a/examples/opengl/paintedwindow/paintedwindow.pro b/examples/opengl/paintedwindow/paintedwindow.pro
index 098329ac4d3..fd7446ebc0f 100644
--- a/examples/opengl/paintedwindow/paintedwindow.pro
+++ b/examples/opengl/paintedwindow/paintedwindow.pro
@@ -2,7 +2,7 @@ HEADERS += paintedwindow.h
 SOURCES += paintedwindow.cpp main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/paintedwindow
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/paintedwindow
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS paintedwindow.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/paintedwindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/paintedwindow
 INSTALLS += target sources
diff --git a/examples/opengl/pbuffers/pbuffers.pro b/examples/opengl/pbuffers/pbuffers.pro
index 431ad7a2415..3145233179e 100644
--- a/examples/opengl/pbuffers/pbuffers.pro
+++ b/examples/opengl/pbuffers/pbuffers.pro
@@ -7,13 +7,13 @@ RESOURCES += pbuffers.qrc
 QT += opengl widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers
 sources.files = $$SOURCES \
     $$HEADERS \
     $$RESOURCES \
     pbuffers.pro \
     *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers
 INSTALLS += target \
     sources
 
diff --git a/examples/opengl/pbuffers2/pbuffers2.pro b/examples/opengl/pbuffers2/pbuffers2.pro
index ba3a039da25..1cc8a5ad316 100644
--- a/examples/opengl/pbuffers2/pbuffers2.pro
+++ b/examples/opengl/pbuffers2/pbuffers2.pro
@@ -5,9 +5,9 @@ SOURCES += glwidget.cpp main.cpp
 RESOURCES += pbuffers2.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers2
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers2
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2
 INSTALLS += target sources
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/opengl/samplebuffers/samplebuffers.pro b/examples/opengl/samplebuffers/samplebuffers.pro
index a903a0b99c5..3196c6c45ac 100644
--- a/examples/opengl/samplebuffers/samplebuffers.pro
+++ b/examples/opengl/samplebuffers/samplebuffers.pro
@@ -4,9 +4,9 @@ SOURCES += glwidget.cpp main.cpp
 QT += opengl widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/samplebuffers
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers
 sources.files = $$SOURCES $$HEADERS samplebuffers.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/samplebuffers
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers
 INSTALLS += target sources
 
 
diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro
index 5da023fb2af..ae8672d9395 100644
--- a/examples/opengl/textures/textures.pro
+++ b/examples/opengl/textures/textures.pro
@@ -7,9 +7,9 @@ RESOURCES     = textures.qrc
 QT           += opengl widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/textures
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS textures.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/textures
+sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures
 INSTALLS += target sources
 
 
diff --git a/examples/qpa/qpa.pro b/examples/qpa/qpa.pro
index b1b4428c23d..0eabfa8cf26 100644
--- a/examples/qpa/qpa.pro
+++ b/examples/qpa/qpa.pro
@@ -2,7 +2,7 @@ TEMPLATE      = subdirs
 SUBDIRS       = windows
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qpa
+target.path = $$[QT_INSTALL_EXAMPLES]/qpa
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qpa.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qpa
+sources.path = $$[QT_INSTALL_EXAMPLES]/qpa
 INSTALLS += target sources
diff --git a/examples/qpa/windows/windows.pro b/examples/qpa/windows/windows.pro
index 151f6027d50..f0d53af6253 100644
--- a/examples/qpa/windows/windows.pro
+++ b/examples/qpa/windows/windows.pro
@@ -5,7 +5,7 @@ HEADERS += window.h
 SOURCES += window.cpp main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qpa/windows
+target.path = $$[QT_INSTALL_EXAMPLES]/qpa/windows
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windows.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qpa/windows
+sources.path = $$[QT_INSTALL_EXAMPLES]/qpa/windows
 INSTALLS += target sources
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro
index b959915a55e..145764bfa0a 100644
--- a/examples/qtconcurrent/imagescaling/imagescaling.pro
+++ b/examples/qtconcurrent/imagescaling/imagescaling.pro
@@ -3,9 +3,9 @@ QT += concurrent widgets
 SOURCES += main.cpp imagescaling.cpp
 HEADERS += imagescaling.h
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/imagescaling
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/imagescaling
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
 INSTALLS += target sources
 
 wince*: DEPLOYMENT_PLUGIN += qgif qjpeg
diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro
index 8212abf9053..62d40d0f17a 100644
--- a/examples/qtconcurrent/map/map.pro
+++ b/examples/qtconcurrent/map/map.pro
@@ -6,9 +6,9 @@ CONFIG -= app_bundle
 
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro
index 3ec3243b6a2..4789adf41f5 100644
--- a/examples/qtconcurrent/progressdialog/progressdialog.pro
+++ b/examples/qtconcurrent/progressdialog/progressdialog.pro
@@ -3,9 +3,9 @@ CONFIG += console
 
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro
index f41ba881a2b..58a55765684 100644
--- a/examples/qtconcurrent/qtconcurrent.pro
+++ b/examples/qtconcurrent/qtconcurrent.pro
@@ -17,7 +17,7 @@ contains(QT_CONFIG, no-widgets) {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
 INSTALLS += target sources
diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro
index 951171885f9..a73b56e857c 100644
--- a/examples/qtconcurrent/runfunction/runfunction.pro
+++ b/examples/qtconcurrent/runfunction/runfunction.pro
@@ -4,9 +4,9 @@ CONFIG -= app_bundle
 
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro
index c0804ac9f5a..acb3d5454e5 100644
--- a/examples/qtconcurrent/wordcount/wordcount.pro
+++ b/examples/qtconcurrent/wordcount/wordcount.pro
@@ -4,9 +4,9 @@ CONFIG -= app_bundle
 
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount
+target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro
index 9a1f6acfda7..8addbcba63f 100644
--- a/examples/qtestlib/qtestlib.pro
+++ b/examples/qtestlib/qtestlib.pro
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
 SUBDIRS = tutorial1 tutorial2 tutorial3 tutorial4 tutorial5
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtestlib.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib
 INSTALLS += target sources
diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro
index 04bd515a1de..016de61d7bd 100644
--- a/examples/qtestlib/tutorial1/tutorial1.pro
+++ b/examples/qtestlib/tutorial1/tutorial1.pro
@@ -2,9 +2,9 @@ SOURCES = testqstring.cpp
 QT += testlib
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial1
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial1
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro
index e3cfd10d4ef..b8f73a9b520 100644
--- a/examples/qtestlib/tutorial2/tutorial2.pro
+++ b/examples/qtestlib/tutorial2/tutorial2.pro
@@ -2,9 +2,9 @@ SOURCES = testqstring.cpp
 QT += testlib
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial2
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial2
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro
index f9ea8be7535..18183226efa 100644
--- a/examples/qtestlib/tutorial3/tutorial3.pro
+++ b/examples/qtestlib/tutorial3/tutorial3.pro
@@ -2,9 +2,9 @@ SOURCES = testgui.cpp
 QT += testlib
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial3
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial3
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro
index cf0e3171285..6c82aa65003 100644
--- a/examples/qtestlib/tutorial4/tutorial4.pro
+++ b/examples/qtestlib/tutorial4/tutorial4.pro
@@ -2,9 +2,9 @@ SOURCES = testgui.cpp
 QT += testlib
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial4
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial4
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro
index 950996c8cbc..3120c409121 100644
--- a/examples/qtestlib/tutorial5/tutorial5.pro
+++ b/examples/qtestlib/tutorial5/tutorial5.pro
@@ -2,9 +2,9 @@ SOURCES = benchmarking.cpp
 QT += testlib
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial5
+target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial5
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/sql/books/books.pro b/examples/sql/books/books.pro
index 5a26d179a6a..4a15f62f0da 100644
--- a/examples/sql/books/books.pro
+++ b/examples/sql/books/books.pro
@@ -8,9 +8,9 @@ FORMS       = bookwindow.ui
 
 QT += sql widgets widgets
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/books
+target.path = $$[QT_INSTALL_EXAMPLES]/sql/books
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/books
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql/books
 INSTALLS += target sources
 
 
diff --git a/examples/sql/cachedtable/cachedtable.pro b/examples/sql/cachedtable/cachedtable.pro
index 48d3d27da9e..fca311d939b 100644
--- a/examples/sql/cachedtable/cachedtable.pro
+++ b/examples/sql/cachedtable/cachedtable.pro
@@ -5,8 +5,8 @@ SOURCES       = main.cpp \
 QT           += sql widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/cachedtable
+target.path = $$[QT_INSTALL_EXAMPLES]/sql/cachedtable
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS cachedtable.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/cachedtable
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql/cachedtable
 INSTALLS += target sources
 
diff --git a/examples/sql/drilldown/drilldown.pro b/examples/sql/drilldown/drilldown.pro
index a6f593e2f84..2743462b8e3 100644
--- a/examples/sql/drilldown/drilldown.pro
+++ b/examples/sql/drilldown/drilldown.pro
@@ -10,7 +10,7 @@ SOURCES = imageitem.cpp \
 QT += sql widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/drilldown
+target.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS drilldown.pro *.png *.jpg images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/drilldown
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown
 INSTALLS += target sources
diff --git a/examples/sql/masterdetail/masterdetail.pro b/examples/sql/masterdetail/masterdetail.pro
index 2160ad3c26b..e7935562c63 100644
--- a/examples/sql/masterdetail/masterdetail.pro
+++ b/examples/sql/masterdetail/masterdetail.pro
@@ -10,7 +10,7 @@ QT += sql widgets
 QT += xml widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/masterdetail
+target.path = $$[QT_INSTALL_EXAMPLES]/sql/masterdetail
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS masterdetail.pro *.xml images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/masterdetail
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql/masterdetail
 INSTALLS += target sources
diff --git a/examples/sql/querymodel/querymodel.pro b/examples/sql/querymodel/querymodel.pro
index 0a335ae67f7..678ec931509 100644
--- a/examples/sql/querymodel/querymodel.pro
+++ b/examples/sql/querymodel/querymodel.pro
@@ -7,8 +7,8 @@ SOURCES       = customsqlmodel.cpp \
 QT           += sql widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/querymodel
+target.path = $$[QT_INSTALL_EXAMPLES]/sql/querymodel
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS querymodel.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/querymodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql/querymodel
 INSTALLS += target sources
 
diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.pro b/examples/sql/relationaltablemodel/relationaltablemodel.pro
index 2c741d02f61..5b211746576 100644
--- a/examples/sql/relationaltablemodel/relationaltablemodel.pro
+++ b/examples/sql/relationaltablemodel/relationaltablemodel.pro
@@ -3,8 +3,8 @@ SOURCES       = relationaltablemodel.cpp
 QT           += sql widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/relationaltablemodel
+target.path = $$[QT_INSTALL_EXAMPLES]/sql/relationaltablemodel
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS relationaltablemodel.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/relationaltablemodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql/relationaltablemodel
 INSTALLS += target sources
 
diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro
index 463683f48d1..64f103aa7de 100644
--- a/examples/sql/sql.pro
+++ b/examples/sql/sql.pro
@@ -20,5 +20,5 @@ SUBDIRS             =   books \
 
 # install
 sources.files = connection.h sql.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql
 INSTALLS += sources
diff --git a/examples/sql/sqlbrowser/sqlbrowser.pro b/examples/sql/sqlbrowser/sqlbrowser.pro
index d2f1cacc674..3fca9a01a69 100644
--- a/examples/sql/sqlbrowser/sqlbrowser.pro
+++ b/examples/sql/sqlbrowser/sqlbrowser.pro
@@ -13,9 +13,9 @@ build_all:!build_pass {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/sqlbrowser
+target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlbrowser
 sources.files = $$SOURCES $$HEADERS $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/sqlbrowser
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlbrowser
 INSTALLS += target sources
 
 
diff --git a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
index 75256d71c27..0de966c0e49 100644
--- a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
+++ b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
@@ -4,9 +4,9 @@ SOURCES   = main.cpp \
 QT += sql widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/sqlwidgetmapper
+target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/sqlwidgetmapper
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper
 INSTALLS += target sources
 
 wince*: DEPLOYMENT_PLUGIN += qsqlite
diff --git a/examples/sql/tablemodel/tablemodel.pro b/examples/sql/tablemodel/tablemodel.pro
index 0853f4c8e8c..a6842b4c7fb 100644
--- a/examples/sql/tablemodel/tablemodel.pro
+++ b/examples/sql/tablemodel/tablemodel.pro
@@ -3,8 +3,8 @@ SOURCES       = tablemodel.cpp
 QT           += sql widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/tablemodel
+target.path = $$[QT_INSTALL_EXAMPLES]/sql/tablemodel
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS tablemodel.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/tablemodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/sql/tablemodel
 INSTALLS += target sources
 
diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro
index dc2ab6973bd..a2088cb8b01 100644
--- a/examples/threads/mandelbrot/mandelbrot.pro
+++ b/examples/threads/mandelbrot/mandelbrot.pro
@@ -7,9 +7,9 @@ SOURCES       = main.cpp \
 unix:!mac:!vxworks:!integrity:LIBS += -lm
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/mandelbrot
+target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mandelbrot.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/mandelbrot
+sources.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/threads/semaphores/semaphores.pro b/examples/threads/semaphores/semaphores.pro
index 98159bb69cf..49690a6b4b5 100644
--- a/examples/threads/semaphores/semaphores.pro
+++ b/examples/threads/semaphores/semaphores.pro
@@ -5,9 +5,9 @@ CONFIG -= app_bundle
 CONFIG += console
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/semaphores
+target.path = $$[QT_INSTALL_EXAMPLES]/threads/semaphores
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS semaphores.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/semaphores
+sources.path = $$[QT_INSTALL_EXAMPLES]/threads/semaphores
 INSTALLS += target sources
 
 
diff --git a/examples/threads/threads.pro b/examples/threads/threads.pro
index 084ce1a68ff..a97861d8564 100644
--- a/examples/threads/threads.pro
+++ b/examples/threads/threads.pro
@@ -5,7 +5,7 @@ SUBDIRS       = semaphores \
 !contains(QT_CONFIG, no-widgets):SUBDIRS += mandelbrot
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads
+target.path = $$[QT_INSTALL_EXAMPLES]/threads
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threads.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads
+sources.path = $$[QT_INSTALL_EXAMPLES]/threads
 INSTALLS += target sources
diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro
index 29ef9b83344..a8298266f86 100644
--- a/examples/threads/waitconditions/waitconditions.pro
+++ b/examples/threads/waitconditions/waitconditions.pro
@@ -5,9 +5,9 @@ CONFIG += console
 SOURCES += waitconditions.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/waitconditions
+target.path = $$[QT_INSTALL_EXAMPLES]/threads/waitconditions
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS waitconditions.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/waitconditions
+sources.path = $$[QT_INSTALL_EXAMPLES]/threads/waitconditions
 INSTALLS += target sources
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/tools/codecs/codecs.pro b/examples/tools/codecs/codecs.pro
index 7f1ff0f308b..377dfaa8c9e 100644
--- a/examples/tools/codecs/codecs.pro
+++ b/examples/tools/codecs/codecs.pro
@@ -5,9 +5,9 @@ SOURCES      += main.cpp \
                 previewform.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/codecs
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/codecs
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS encodedfiles codecs.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/codecs
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/codecs
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/completer/completer.pro b/examples/tools/completer/completer.pro
index 67008b5dd2a..a735b7ceae3 100644
--- a/examples/tools/completer/completer.pro
+++ b/examples/tools/completer/completer.pro
@@ -6,9 +6,9 @@ SOURCES   = fsmodel.cpp \
 RESOURCES = completer.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/completer
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/completer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS completer.pro resources
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/completer
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/completer
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/contiguouscache/contiguouscache.pro b/examples/tools/contiguouscache/contiguouscache.pro
index ca6d4f4e317..2b8b3e93653 100644
--- a/examples/tools/contiguouscache/contiguouscache.pro
+++ b/examples/tools/contiguouscache/contiguouscache.pro
@@ -3,9 +3,9 @@ SOURCES       = randomlistmodel.cpp \
                 main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/contiguouscache
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/contiguouscache
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS contiguouscache.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/contiguouscache
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/contiguouscache
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/tools/customcompleter/customcompleter.pro b/examples/tools/customcompleter/customcompleter.pro
index fd4a101e88d..b61cb510e95 100644
--- a/examples/tools/customcompleter/customcompleter.pro
+++ b/examples/tools/customcompleter/customcompleter.pro
@@ -6,9 +6,9 @@ SOURCES   = main.cpp \
 RESOURCES = customcompleter.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/customcompleter
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro resources
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/customcompleter
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/echoplugin/echoplugin.pro b/examples/tools/echoplugin/echoplugin.pro
index 06ef2e11171..ffd48fd25f2 100644
--- a/examples/tools/echoplugin/echoplugin.pro
+++ b/examples/tools/echoplugin/echoplugin.pro
@@ -5,9 +5,9 @@ SUBDIRS	    = echowindow \
 #! [0]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echoplugin.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/echoplugin/echowindow/echowindow.pro b/examples/tools/echoplugin/echowindow/echowindow.pro
index 0b7c307f7a3..90bc831de1b 100644
--- a/examples/tools/echoplugin/echowindow/echowindow.pro
+++ b/examples/tools/echoplugin/echowindow/echowindow.pro
@@ -13,9 +13,9 @@ win32 {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echowindow.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin/echowindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/echowindow
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/echoplugin/plugin/plugin.pro b/examples/tools/echoplugin/plugin/plugin.pro
index 1275fd410b4..532a3825866 100644
--- a/examples/tools/echoplugin/plugin/plugin.pro
+++ b/examples/tools/echoplugin/plugin/plugin.pro
@@ -10,9 +10,9 @@ DESTDIR         = ../plugins
 #! [0]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin/plugin
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro echoplugin.json
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin/plugin
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/i18n/i18n.pro b/examples/tools/i18n/i18n.pro
index 794e010648b..a02e25dcd04 100644
--- a/examples/tools/i18n/i18n.pro
+++ b/examples/tools/i18n/i18n.pro
@@ -20,9 +20,9 @@ TRANSLATIONS += translations/i18n_ar.ts \
                 translations/i18n_zh.ts
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/i18n
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/i18n
 sources.files = $$SOURCES $$HEADERS $$RESOURCES translations i18n.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/i18n
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/i18n
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/plugandpaint/plugandpaint.pro b/examples/tools/plugandpaint/plugandpaint.pro
index 935b6b3c061..d9b836c7aea 100644
--- a/examples/tools/plugandpaint/plugandpaint.pro
+++ b/examples/tools/plugandpaint/plugandpaint.pro
@@ -17,9 +17,9 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
 #! [0]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaint
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaint.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaint
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/plugandpaintplugins/basictools/basictools.pro b/examples/tools/plugandpaintplugins/basictools/basictools.pro
index f3b197a60f9..3190e45c46d 100644
--- a/examples/tools/plugandpaintplugins/basictools/basictools.pro
+++ b/examples/tools/plugandpaintplugins/basictools/basictools.pro
@@ -10,9 +10,9 @@ DESTDIR       = ../../plugandpaint/plugins
 #! [0]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaint/plugins
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint/plugins
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basictools.pro basictools.json
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins/basictools
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins/basictools
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
index 9df58784161..bc7ccffc0a5 100644
--- a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
+++ b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
@@ -10,9 +10,9 @@ DESTDIR       = ../../plugandpaint/plugins
 
 #! [0]
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaint/plugins
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint/plugins
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extrafilters.pro extrafilters.json
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins/extrafilters
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins/extrafilters
 INSTALLS += target sources
 
 
diff --git a/examples/tools/plugandpaintplugins/plugandpaintplugins.pro b/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
index 5e783df478e..8eab48e92d8 100644
--- a/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
+++ b/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
@@ -3,9 +3,9 @@ SUBDIRS       = basictools \
                 extrafilters
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaintplugins.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/regexp/regexp.pro b/examples/tools/regexp/regexp.pro
index 48cd6d362aa..8e88511ead1 100644
--- a/examples/tools/regexp/regexp.pro
+++ b/examples/tools/regexp/regexp.pro
@@ -3,9 +3,9 @@ SOURCES       = regexpdialog.cpp \
                 main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/regexp
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/regexp
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS regexp.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/regexp
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/regexp
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/settingseditor/settingseditor.pro b/examples/tools/settingseditor/settingseditor.pro
index 79bcdf5dfe9..2499b22436a 100644
--- a/examples/tools/settingseditor/settingseditor.pro
+++ b/examples/tools/settingseditor/settingseditor.pro
@@ -9,9 +9,9 @@ SOURCES       = locationdialog.cpp \
                 variantdelegate.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/settingseditor
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/settingseditor
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS settingseditor.pro inifiles
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/settingseditor
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/settingseditor
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/styleplugin/plugin/plugin.pro b/examples/tools/styleplugin/plugin/plugin.pro
index b0dd871b7b3..c13af5a36c6 100644
--- a/examples/tools/styleplugin/plugin/plugin.pro
+++ b/examples/tools/styleplugin/plugin/plugin.pro
@@ -16,9 +16,9 @@ win32 {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin/styles
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/styles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin/plugin
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/plugin
 INSTALLS += target sources
 
 
diff --git a/examples/tools/styleplugin/styleplugin.pro b/examples/tools/styleplugin/styleplugin.pro
index 51a5e4ec9f8..63805a14cc5 100644
--- a/examples/tools/styleplugin/styleplugin.pro
+++ b/examples/tools/styleplugin/styleplugin.pro
@@ -3,9 +3,9 @@ SUBDIRS		= stylewindow \
 		  plugin
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styleplugin.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/styleplugin/stylewindow/stylewindow.pro b/examples/tools/styleplugin/stylewindow/stylewindow.pro
index 319e230943c..658a46134be 100644
--- a/examples/tools/styleplugin/stylewindow/stylewindow.pro
+++ b/examples/tools/styleplugin/stylewindow/stylewindow.pro
@@ -11,9 +11,9 @@ win32 {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stylewindow.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin/stylewindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/stylewindow
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro
index c72dbd404d8..c0e5b5aa754 100644
--- a/examples/tools/tools.pro
+++ b/examples/tools/tools.pro
@@ -18,7 +18,7 @@ SUBDIRS       = codecs \
 plugandpaint.depends = plugandpaintplugins
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools
+target.path = $$[QT_INSTALL_EXAMPLES]/tools
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tools.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools
 INSTALLS += target sources
diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.pro b/examples/tools/treemodelcompleter/treemodelcompleter.pro
index 82d8404446d..ffdf9b647da 100644
--- a/examples/tools/treemodelcompleter/treemodelcompleter.pro
+++ b/examples/tools/treemodelcompleter/treemodelcompleter.pro
@@ -6,9 +6,9 @@ SOURCES   = treemodelcompleter.cpp \
 RESOURCES = treemodelcompleter.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/treemodelcompleter
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/treemodelcompleter
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS treemodelcompleter.pro resources
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/treemodelcompleter
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/treemodelcompleter
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/tools/undo/undo.pro b/examples/tools/undo/undo.pro
index bf7dc388eed..e61b678a934 100644
--- a/examples/tools/undo/undo.pro
+++ b/examples/tools/undo/undo.pro
@@ -10,9 +10,9 @@ build_all:!build_pass {
 RESOURCES += undo.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/undo
 sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/undo
 INSTALLS += target sources
 
 QT += widgets 
diff --git a/examples/tools/undoframework/undoframework.pro b/examples/tools/undoframework/undoframework.pro
index a51a43721e5..d50247442af 100644
--- a/examples/tools/undoframework/undoframework.pro
+++ b/examples/tools/undoframework/undoframework.pro
@@ -10,9 +10,9 @@ SOURCES	    = commands.cpp \
 RESOURCES   = undoframework.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undoframework
+target.path = $$[QT_INSTALL_EXAMPLES]/tools/undoframework
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS undoframework.pro README images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undoframework
+sources.path = $$[QT_INSTALL_EXAMPLES]/tools/undoframework
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/touch/dials/dials.pro b/examples/touch/dials/dials.pro
index 1279098b86e..c6259962e06 100644
--- a/examples/touch/dials/dials.pro
+++ b/examples/touch/dials/dials.pro
@@ -2,9 +2,9 @@ SOURCES += main.cpp
 FORMS += dials.ui
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/dials
+target.path = $$[QT_INSTALL_EXAMPLES]/touch/dials
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dials.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/dials
+sources.path = $$[QT_INSTALL_EXAMPLES]/touch/dials
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/touch/fingerpaint/fingerpaint.pro b/examples/touch/fingerpaint/fingerpaint.pro
index 4a17ed91b3f..a47aa98f67b 100644
--- a/examples/touch/fingerpaint/fingerpaint.pro
+++ b/examples/touch/fingerpaint/fingerpaint.pro
@@ -5,9 +5,9 @@ SOURCES       = main.cpp \
                 scribblearea.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/fingerpaint
+target.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fingerpaint.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/fingerpaint
+sources.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/touch/knobs/knobs.pro b/examples/touch/knobs/knobs.pro
index a87bec9b251..bf0c45845fa 100644
--- a/examples/touch/knobs/knobs.pro
+++ b/examples/touch/knobs/knobs.pro
@@ -2,9 +2,9 @@ HEADERS = knob.h
 SOURCES = main.cpp knob.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/knobs
+target.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS knobs.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/knobs
+sources.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/touch/pinchzoom/pinchzoom.pro b/examples/touch/pinchzoom/pinchzoom.pro
index 5e27befd3bb..f841041e356 100644
--- a/examples/touch/pinchzoom/pinchzoom.pro
+++ b/examples/touch/pinchzoom/pinchzoom.pro
@@ -10,9 +10,9 @@ RESOURCES += \
 	mice.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/pinchzoom
+target.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pinchzoom.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/pinchzoom
+sources.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/touch/touch.pro b/examples/touch/touch.pro
index 005e22be90f..cfbae8b5907 100644
--- a/examples/touch/touch.pro
+++ b/examples/touch/touch.pro
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
 SUBDIRS = pinchzoom fingerpaint knobs dials
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch
+target.path = $$[QT_INSTALL_EXAMPLES]/touch
 sources.files = touch.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch
+sources.path = $$[QT_INSTALL_EXAMPLES]/touch
 INSTALLS += target sources
diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.pro b/examples/widgets/animation/animatedtiles/animatedtiles.pro
index b25d7e65c20..03907d10f4f 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 fd22891f773..7cc46a56137 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 868fe59f8e9..ac7b0ca335d 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 581103a4bf7..3263d07089b 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 35693bf25d6..b7335652c07 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 1aedc68f858..9ab3113111d 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 16d9b79a71d..527fdf1132c 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 0e738a5c969..835fc8d2d84 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 d190a3bc2f8..79d85e41fa9 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 db1a16a2e1b..bcab23918bc 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 57a4f5b6812..c028b04f046 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 d02b7038469..9802584d75b 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 6c52d6639fe..fbef6585236 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 8662fc5be21..af916ea0294 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 4b538e15a52..91eccf5a729 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 a2f33ea29e6..fe4ec427d33 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 fe395786dc0..8d5bed48585 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 ae395fdd2c7..57b4ac63311 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 f18034d7aec..86bc7c46b1a 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 fc3ad17deae..9c62dfb6084 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 c9859bc5781..cf3d7316f59 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 59134fb978b..06a161e1ac7 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 41e832fcc67..e9398e03421 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 669c3a32cce..db40af37cc2 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 abb171ad3c8..06bca8a1ae3 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 95159ccdf5f..ac6adb354ce 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 3407a5e094d..27acea6590d 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 640b40936ae..105b7a49e70 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 db6ab7dccc3..74c2d1c0398 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 d7ec946180e..89953eb18b9 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 8ad08c2d095..2ab7811e4fd 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 bc8204edcaf..8fb03edd602 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 47750be15bc..3de54d77576 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 6cfecf1dd0b..1fc91352c76 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 d58253e2b60..a979d60da06 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 8135c6300ad..10755cdb652 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 ae6c903e648..cc97758b438 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 6e41f78d4f5..1e21ee8b9e6 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 d1f242597e4..160c7fbbdd2 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 f59e8b5a2c7..7b624730503 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 bc83c06f44e..8a98c87032c 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 667252d5236..590e79c5d26 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 43ec031452d..efbb09308f9 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 d3b74c43f87..0378c375a1f 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 5fba67f0ba1..5cd625f9b44 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 f7eafc19cb1..d9c98af2911 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 ec0b683cefa..7f308123055 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 5aacbf92ba5..3b1a5adf1d6 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 c146aa76359..4ee87e0b57d 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 4be203a827d..c4320625a99 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 fe3fc84c819..762f932c3c6 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 103fc457cba..481bddf3b3c 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 3e43837ee6f..43d9634a3b2 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 0dd9ee6a5d2..a0abf64b7a6 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 2d9639ba226..6d8074ebaaf 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 1f8f21db508..ce5e3cb3163 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 8457e88d6f1..79d57acb784 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 dd1ba73ac46..e5ba8e253f5 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 3c053e30adc..fe912656d1c 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 c02aeb373af..c0399bd96b8 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 7c56cdaf30d..f18f8eb81f2 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 e8ff67d5719..fac8aabe579 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 870c9d16b69..27ea88f50ed 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 14d6b704416..d551b900c8f 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 56f85d876e6..4ea0d892ca4 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 3c3710e0fde..39cfa65661f 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 8f0d40dc260..0260162cbbe 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 2d7c7c5b905..43e06063579 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 df13f5e11df..f2a3e992266 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 cb1a44e61e9..230e6a5ce48 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 cbf8b607603..3768ce5d66b 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 c52c883d2e5..598cfae9719 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 2ff1dafcf8a..b5cd71b1bf4 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 021e442acba..1f2fa419f5e 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 82f08daf482..88efd0e6cfa 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 06de2ebf420..e383b6c4263 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 162532a2395..d11c47b850c 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 21515d8930a..e9fc0b6bdd4 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 5a5e46f12f6..b9c575ebb97 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 fba796509cc..60b768f85a0 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 0594cc0be31..05b38cee06a 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 dc405315652..1b978677523 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 a420ea941a7..eff007464da 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 8cf2bf71fdb..0f913b43a2d 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 e1baeeb4666..ed78e4fd2a4 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 877270f5a81..095e1e7f2db 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 3e5006f509e..64635be53c7 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 2fac6507e78..99cb2397ff5 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 ce5884fff7f..0249d5a7c37 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 a22bf608bdd..db94e7aafda 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 665811d3c86..3d27957a593 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 6ed9b1cd327..eeeb2f9c2ea 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 067aab38751..a44a3f082eb 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 168b5007e40..f8624e8b335 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 381b615b649..5bb2cec8cdd 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 012aef05502..35eaf8808cf 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 90c203a49b9..fdc009235b0 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 ef7671f6b0c..bf4c64be6b4 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 36bfe8e6fb4..e6d6633de67 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 6c831ea2cbd..cb3900dbb65 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 b99060de75b..b0d90d1a918 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 32888d83907..a2cbe16aa15 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 2a2d3b90ca6..cc471e731fc 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 776da71c54e..0b61879e55c 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 d1d822c3309..46626d36deb 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 6192269e072..8db6a819a8e 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 305228ea238..08a870a77eb 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 201df064cc1..34408264c2c 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 ee113c0f9c3..a2fb6c5fca8 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 70551214601..68705fc8076 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 2066e93a5bd..fcaf3fc66ff 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 6541eb6cfa2..34bcb8f8fc6 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 ab1e7ad594a..e0981a7da90 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 4e26f48af92..80bc073e71a 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 c44a048797b..e8722df3181 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 ae95f6fab7c..65247f3e615 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 6809a9e27aa..79cf2da5510 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 82b2624069f..61ceb908020 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 b12fcac50a7..8f42a07025f 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 91672e7bfaf..f7a958cf97c 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 fcb5c370605..90fc0ca2294 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 4b1ac2456d5..98a834f5f6d 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 6866ba95817..4a0604fc3fd 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 199c24b681b..e6eb0d45f2b 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 be220d37a36..c3f30e58100 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 88f1b9817eb..f51e531cbdf 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 d88f722111a..5221bda09db 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 84fdf940e8f..a3687aa4b2f 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 4f2a38d6dbb..4aa8ed10393 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 8032ceedac0..668b2570cf7 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 2fb5d25c011..8993d7149ba 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 7ae2eedfda5..a343b63fdb9 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 d67d151dd67..cea272439e2 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 8ed6cf2b209..1e35d6cd679 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 1865700e784..f3eaac0a7d4 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 c335d185e25..2d6460fc4d4 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 973836d4683..833781b36a7 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 b6e87acf887..794c095aa08 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 291dbf156d0..8bc14d09c3d 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 c9afbe02652..6e60fd14bc5 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 384c3528f65..5037b373699 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 f7bd4df0e8e..fd26fae6f75 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 3a7cf8f9d6a..144dffa6310 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 c95a2f53cdd..6f04e9582ef 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 9c7dc95edd0..2655559435f 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 7bcb4d54917..fd2506612ca 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 bb83f3f690a..318453e5a7b 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 770c34c4adb..d87f7780f18 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 cbfba273ed8..4f527b15406 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 ee7186dd8c2..d238849403e 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 9f0a5002d1d..7e6cb7b10c6 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 68ec72400ed..d9cfe3733f4 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 d3890a9b717..20768295e64 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 dab67c5a3d7..6cb004ebbff 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 ee861e8dfaf..89e733351bb 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 1f79fcba762..a6771ee51cd 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 d360c3f6ed6..08e16cb7c2d 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 8787c7d7f98..c5069f36273 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 ca22d65bcb5..150808b310e 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 b66ccf382d1..ec28f926e1c 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 8d16866ebff..4dadabc730f 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 8b3bea1ae79..f339e9b082e 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 81ae2243c54..135d8d33e31 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 89786bec7db..50cdf797812 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 eaed4679f17..7e910921cb7 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 a83f8b80d59..bdb8593afb6 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 0ef1a0eed2b..510b0e842d9 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 b425882bf25..0b5b198cfe3 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 7fa0a4d7cd5..b05e832edef 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 da5c388fbf0..92d5c5ebb24 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 5b0d4c1d840..97c3e9a8d45 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 59260fbc361..759dbb7bc8e 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 e3e8520f8dc..d226ffff120 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 561d70ab07e..f56aa1e4f4b 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 ec4d3af3bfc..92f935454b9 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 a7062fa7eb7..9bdb76e40ed 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 c98b7a8b9ad..a1ea42fd5df 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
diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro
index 9c1746a67f2..42fdb17137f 100644
--- a/examples/xml/dombookmarks/dombookmarks.pro
+++ b/examples/xml/dombookmarks/dombookmarks.pro
@@ -6,9 +6,9 @@ SOURCES       = main.cpp \
 QT           += xml widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/dombookmarks
+target.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dombookmarks.pro *.xbel
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/dombookmarks
+sources.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks
 INSTALLS += target sources
 
 wince*: {
diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro
index fc567c4067d..503ff4060bc 100644
--- a/examples/xml/htmlinfo/htmlinfo.pro
+++ b/examples/xml/htmlinfo/htmlinfo.pro
@@ -13,7 +13,7 @@ wince*:{
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/htmlinfo
+target.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.html htmlinfo.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/htmlinfo
+sources.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo
 INSTALLS += target sources
diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/xml/rsslisting/rsslisting.pro
index b0920cc8e74..0cbf2437f8b 100644
--- a/examples/xml/rsslisting/rsslisting.pro
+++ b/examples/xml/rsslisting/rsslisting.pro
@@ -3,7 +3,7 @@ SOURCES += main.cpp rsslisting.cpp
 QT += network xml widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/rsslisting
+target.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS rsslisting.pro 
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/rsslisting
+sources.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting
 INSTALLS += target sources
diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro
index 4d2a2800fb6..cf9cc140bb4 100644
--- a/examples/xml/saxbookmarks/saxbookmarks.pro
+++ b/examples/xml/saxbookmarks/saxbookmarks.pro
@@ -8,9 +8,9 @@ SOURCES       = main.cpp \
 QT           += xml widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/saxbookmarks
+target.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS saxbookmarks.pro *.xbel
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/saxbookmarks
+sources.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks
 INSTALLS += target sources
 
 wince*: {
diff --git a/examples/xml/streambookmarks/streambookmarks.pro b/examples/xml/streambookmarks/streambookmarks.pro
index 3342d5ee35e..27d84ae68b3 100644
--- a/examples/xml/streambookmarks/streambookmarks.pro
+++ b/examples/xml/streambookmarks/streambookmarks.pro
@@ -8,7 +8,7 @@ SOURCES       = main.cpp \
 QT           += xml widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/streambookmarks
+target.path = $$[QT_INSTALL_EXAMPLES]/xml/streambookmarks
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS streambookmarks.pro *.xbel
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/streambookmarks
+sources.path = $$[QT_INSTALL_EXAMPLES]/xml/streambookmarks
 INSTALLS += target sources
diff --git a/examples/xml/xml.pro b/examples/xml/xml.pro
index 4e8e9401b7d..739ada31c7b 100644
--- a/examples/xml/xml.pro
+++ b/examples/xml/xml.pro
@@ -11,7 +11,7 @@ SUBDIRS       = htmlinfo \
 
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml
+target.path = $$[QT_INSTALL_EXAMPLES]/xml
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xml.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml
+sources.path = $$[QT_INSTALL_EXAMPLES]/xml
 INSTALLS += target sources
diff --git a/examples/xml/xmlstreamlint/xmlstreamlint.pro b/examples/xml/xmlstreamlint/xmlstreamlint.pro
index 07744002d93..d237740effb 100644
--- a/examples/xml/xmlstreamlint/xmlstreamlint.pro
+++ b/examples/xml/xmlstreamlint/xmlstreamlint.pro
@@ -5,9 +5,9 @@ QT       += xml
 SOURCES  += main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/xmlstreamlint
+target.path = $$[QT_INSTALL_EXAMPLES]/xml/xmlstreamlint
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlstreamlint.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/xmlstreamlint
+sources.path = $$[QT_INSTALL_EXAMPLES]/xml/xmlstreamlint
 INSTALLS += target sources
 
 
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
index 45be88664b0..759216d46d3 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
@@ -12,9 +12,9 @@ build_all:!build_pass {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip
+target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/chip
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip
+sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/chip
 INSTALLS += target sources
 
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
author	hjk <[email protected]>	2012-11-26 14:04:31 +0100
committer	The Qt Project <[email protected]>	2012-11-26 14:35:23 +0100
commit	c527dd44be9cee5da06ce397f89e3a2595d4ed37 (patch)
tree	05d6d59ff9439832735ba3ee429acb7be3994af0
parent	b34c48d95bf94f787fe693e28126e37a4bb485c1 (diff)