Fix QTBUG-19249

Other fixes to windows QML also needed, but this one was package related.
Have setup to launch the sample programs by using windows shortcut (.lnk)
files as these provide the ability to specify the current directory to
run the program from, making it possible to locate the .dll's.

Using shortcut files implies also have to create icons for all the
programs as well.

24 files changed, 46 insertions, 0 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 98a5006d1..27eae6f8e 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -43,3 +43,7 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+OTHER_FILES += \
+    cubehouse.rc
+
+RC_FILE = cubehouse.rc
diff --git a/demos/qt3d/cubehouse/cubehouse.rc b/demos/qt3d/cubehouse/cubehouse.rc
new file mode 100644
index 000000000..b40ecdc12
--- /dev/null
+++ b/demos/qt3d/cubehouse/cubehouse.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/qt3d/cubehouse/qt3d.ico b/demos/qt3d/cubehouse/qt3d.ico
new file mode 100644
index 000000000..1d07c43dd
--- /dev/null
+++ b/demos/qt3d/cubehouse/qt3d.ico
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index 6c530bdf2..3ac9e2505 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -38,3 +38,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    pageflip.rc
+
+RC_FILE = pageflip.rc
diff --git a/demos/qt3d/pageflip/pageflip.rc b/demos/qt3d/pageflip/pageflip.rc
new file mode 100644
index 000000000..b40ecdc12
--- /dev/null
+++ b/demos/qt3d/pageflip/pageflip.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/qt3d/pageflip/qt3d.ico b/demos/qt3d/pageflip/qt3d.ico
new file mode 100644
index 000000000..1d07c43dd
--- /dev/null
+++ b/demos/qt3d/pageflip/qt3d.ico
diff --git a/demos/qt3d/photobrowser3d/photobrowser.rc b/demos/qt3d/photobrowser3d/photobrowser.rc
new file mode 100644
index 000000000..b40ecdc12
--- /dev/null
+++ b/demos/qt3d/photobrowser3d/photobrowser.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index 093e0bd47..36c0564a2 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -94,3 +94,7 @@ symbian {
     }
 }
 
+OTHER_FILES += \
+    photobrowser.rc
+
+RC_FILE = photobrowser.rc
diff --git a/demos/qt3d/photobrowser3d/qt3d.ico b/demos/qt3d/photobrowser3d/qt3d.ico
new file mode 100644
index 000000000..1d07c43dd
--- /dev/null
+++ b/demos/qt3d/photobrowser3d/qt3d.ico
diff --git a/demos/qt3d/shapes/qt3d.ico b/demos/qt3d/shapes/qt3d.ico
new file mode 100644
index 000000000..1d07c43dd
--- /dev/null
+++ b/demos/qt3d/shapes/qt3d.ico
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index f348c0764..932c78400 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -36,3 +36,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    shapes.rc
+
+RC_FILE = shapes.rc
diff --git a/demos/qt3d/shapes/shapes.rc b/demos/qt3d/shapes/shapes.rc
new file mode 100644
index 000000000..b40ecdc12
--- /dev/null
+++ b/demos/qt3d/shapes/shapes.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/qt3d/teaservice/qt3d.ico b/demos/qt3d/teaservice/qt3d.ico
new file mode 100644
index 000000000..1d07c43dd
--- /dev/null
+++ b/demos/qt3d/teaservice/qt3d.ico
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index 195f5e0ec..7f292419e 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -38,3 +38,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    teaservice.rc
+
+RC_FILE = teaservice.rc
diff --git a/demos/qt3d/teaservice/teaservice.rc b/demos/qt3d/teaservice/teaservice.rc
new file mode 100644
index 000000000..b40ecdc12
--- /dev/null
+++ b/demos/qt3d/teaservice/teaservice.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index eb042aec8..12fc553e2 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    model_viewer.rc
+
+RC_FILE = model_viewer.rc
diff --git a/demos/quick3d/model_viewer/model_viewer.rc b/demos/quick3d/model_viewer/model_viewer.rc
new file mode 100644
index 000000000..1b6228c97
--- /dev/null
+++ b/demos/quick3d/model_viewer/model_viewer.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/demos/quick3d/model_viewer/qtquick3d.ico b/demos/quick3d/model_viewer/qtquick3d.ico
new file mode 100644
index 000000000..b3b85e37b
--- /dev/null
+++ b/demos/quick3d/model_viewer/qtquick3d.ico
diff --git a/demos/quick3d/robo_bounce/qtquick3d.ico b/demos/quick3d/robo_bounce/qtquick3d.ico
new file mode 100644
index 000000000..b3b85e37b
--- /dev/null
+++ b/demos/quick3d/robo_bounce/qtquick3d.ico
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index aaa6a37c6..0db4837b3 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    robo_bounce.rc
+
+RC_FILE = robo_bounce.rc
diff --git a/demos/quick3d/robo_bounce/robo_bounce.rc b/demos/quick3d/robo_bounce/robo_bounce.rc
new file mode 100644
index 000000000..1b6228c97
--- /dev/null
+++ b/demos/quick3d/robo_bounce/robo_bounce.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/demos/quick3d/tea_service/qtquick3d.ico b/demos/quick3d/tea_service/qtquick3d.ico
new file mode 100644
index 000000000..b3b85e37b
--- /dev/null
+++ b/demos/quick3d/tea_service/qtquick3d.ico
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index 0d277e463..aea0e75e5 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    tea_service.rc
+
+RC_FILE = tea_service.rc
diff --git a/demos/quick3d/tea_service/tea_service.rc b/demos/quick3d/tea_service/tea_service.rc
new file mode 100644
index 000000000..1b6228c97
--- /dev/null
+++ b/demos/quick3d/tea_service/tea_service.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"