15 files changed, 30 insertions, 30 deletions
diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro
index d481289451..0c981ce505 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 ad84450d0b..c904160d90 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 f835e88a68..073981b9f9 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 6eebfdb738..5267ccf012 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 7b61ef4b3b..33e7c266c8 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 ca0a4bf4cd..850e4e8994 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 5a3d170df8..4195ce2e67 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 b5ede1b83f..cc199f4d4d 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 5b20a62474..387f8a0d75 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 926024ad5b..17ffbe6171 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 098329ac4d..fd7446ebc0 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 431ad7a241..3145233179 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 ba3a039da2..1cc8a5ad31 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 a903a0b99c..3196c6c45a 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 5da023fb2a..ae8672d939 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