Fix installation of ActiveQt examplesv5.0.0-beta1

Active Qt examples cannot have dependencies to sources because not
all installations have sources available. Each example that needs them
now has its own copy of .rc, .def, and .ico files to make them
self-contained.

Task-number: QTBUG-26848
Change-Id: I1ce919dd393ff372ef12c5db268f9f08022fa3f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

21 files changed, 43 insertions, 15 deletions

diff --git a/examples/activeqt/hierarchy/hierarchy.def b/examples/activeqt/hierarchy/hierarchy.def
new file mode 100644
index 0000000..bc82a03
--- /dev/null
+++ b/examples/activeqt/hierarchy/hierarchy.def
@@ -0,0 +1,6 @@
+EXPORTS
+    DllCanUnloadNow      PRIVATE
+    DllGetClassObject    PRIVATE
+    DllRegisterServer    PRIVATE
+    DllUnregisterServer  PRIVATE
+    DumpIDL              PRIVATE
diff --git a/examples/activeqt/hierarchy/hierarchy.ico b/examples/activeqt/hierarchy/hierarchy.ico
new file mode 100644
index 0000000..c80d36a
--- /dev/null
+++ b/examples/activeqt/hierarchy/hierarchy.ico
diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro
index f2c9c56..84ee712 100644
--- a/examples/activeqt/hierarchy/hierarchy.pro
+++ b/examples/activeqt/hierarchy/hierarchy.pro
@@ -7,11 +7,11 @@ QT += widgets
 
 SOURCES	 = objects.cpp main.cpp
 HEADERS	 = objects.h
-RC_FILE	 = $$QT.activeqt.sources/control/qaxserver.rc
-DEF_FILE = $$QT.activeqt.sources/control/qaxserver.def
+RC_FILE  = hierarchy.rc
+DEF_FILE = hierarchy.def
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/hierarchy
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hierarchy.pro
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE $$DEF_FILE hierarchy.ico hierarchy.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/hierarchy
 INSTALLS += target sources
diff --git a/examples/activeqt/hierarchy/hierarchy.rc b/examples/activeqt/hierarchy/hierarchy.rc
new file mode 100644
index 0000000..da962f9
--- /dev/null
+++ b/examples/activeqt/hierarchy/hierarchy.rc
@@ -0,0 +1,2 @@
+1 TYPELIB "hierarchy.rc"
+1 ICON DISCARDABLE "hierarchy.ico"
diff --git a/examples/activeqt/menus/menus.ico b/examples/activeqt/menus/menus.ico
new file mode 100644
index 0000000..c80d36a
--- /dev/null
+++ b/examples/activeqt/menus/menus.ico
diff --git a/examples/activeqt/menus/menus.pro b/examples/activeqt/menus/menus.pro
index c181393..adcaf8e 100644
--- a/examples/activeqt/menus/menus.pro
+++ b/examples/activeqt/menus/menus.pro
@@ -6,10 +6,10 @@ QT += widgets
 
 SOURCES	 = main.cpp menus.cpp
 HEADERS	 = menus.h
-RC_FILE	 = $$QT.activeqt.sources/control/qaxserver.rc
+RC_FILE  = menus.rc
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE menus.ico menus.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus
 INSTALLS += target sources
diff --git a/examples/activeqt/menus/menus.rc b/examples/activeqt/menus/menus.rc
new file mode 100644
index 0000000..fed692c
--- /dev/null
+++ b/examples/activeqt/menus/menus.rc
@@ -0,0 +1,2 @@
+1 TYPELIB "menus.rc"
+1 ICON DISCARDABLE "menus.ico"
diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro
index d4e485b..b5713b0 100644
--- a/examples/activeqt/multiple/multiple.pro
+++ b/examples/activeqt/multiple/multiple.pro
@@ -9,10 +9,10 @@ contains(CONFIG, static):DEFINES += QT_NODLL
 SOURCES	 = main.cpp
 HEADERS	 = ax1.h ax2.h
 RC_FILE  = multipleax.rc
-DEF_FILE = $$QT.activeqt.sources/control/qaxserver.def
+DEF_FILE = multipleax.def
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/multiple
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE $$DEF_FILE multiple.pro
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE $$DEF_FILE multipleax.ico multiple.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/multiple
 INSTALLS += target sources
diff --git a/examples/activeqt/multiple/multipleax.def b/examples/activeqt/multiple/multipleax.def
new file mode 100644
index 0000000..bc82a03
--- /dev/null
+++ b/examples/activeqt/multiple/multipleax.def
@@ -0,0 +1,6 @@
+EXPORTS
+    DllCanUnloadNow      PRIVATE
+    DllGetClassObject    PRIVATE
+    DllRegisterServer    PRIVATE
+    DllUnregisterServer  PRIVATE
+    DumpIDL              PRIVATE
diff --git a/examples/activeqt/multiple/multipleax.ico b/examples/activeqt/multiple/multipleax.ico
new file mode 100644
index 0000000..c80d36a
--- /dev/null
+++ b/examples/activeqt/multiple/multipleax.ico
diff --git a/examples/activeqt/multiple/multipleax.rc b/examples/activeqt/multiple/multipleax.rc
index 7d2c682..ef113bd 100644
--- a/examples/activeqt/multiple/multipleax.rc
+++ b/examples/activeqt/multiple/multipleax.rc
@@ -1,7 +1,7 @@
 #include "winver.h"
 
 1 TYPELIB "multipleax.rc"
-1 ICON DISCARDABLE "..\\..\\..\\src\\activeqt\\control\\qaxserver.ico"
+1 ICON DISCARDABLE "multipleax.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 1,0,0,0
diff --git a/examples/activeqt/opengl/opengl.ico b/examples/activeqt/opengl/opengl.ico
new file mode 100644
index 0000000..c80d36a
--- /dev/null
+++ b/examples/activeqt/opengl/opengl.ico
diff --git a/examples/activeqt/opengl/opengl.pro b/examples/activeqt/opengl/opengl.pro
index 2762345..6c1360a 100644
--- a/examples/activeqt/opengl/opengl.pro
+++ b/examples/activeqt/opengl/opengl.pro
@@ -10,10 +10,11 @@ HEADERS	 = glbox.h \
 SOURCES	 = glbox.cpp \
 	   globjwin.cpp \
 	   main.cpp
-RC_FILE	 = $$QT.activeqt.sources/control/qaxserver.rc
+
+RC_FILE = opengl.rc
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/opengl
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE opengl.ico opengl.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/opengl
 INSTALLS += target sources
diff --git a/examples/activeqt/opengl/opengl.rc b/examples/activeqt/opengl/opengl.rc
new file mode 100644
index 0000000..f8282d8
--- /dev/null
+++ b/examples/activeqt/opengl/opengl.rc
@@ -0,0 +1,2 @@
+1 TYPELIB "opengl.rc"
+1 ICON DISCARDABLE "opengl.ico"
diff --git a/examples/activeqt/simple/simple.ico b/examples/activeqt/simple/simple.ico
new file mode 100644
index 0000000..c80d36a
--- /dev/null
+++ b/examples/activeqt/simple/simple.ico
diff --git a/examples/activeqt/simple/simple.pro b/examples/activeqt/simple/simple.pro
index 8703ecb..297d8e0 100644
--- a/examples/activeqt/simple/simple.pro
+++ b/examples/activeqt/simple/simple.pro
@@ -5,10 +5,10 @@ CONFIG	+= qt warn_off qaxserver
 QT += widgets
 
 SOURCES	 = main.cpp
-RC_FILE	 = $$QT.activeqt.sources/control/qaxserver.rc
+RC_FILE  = simple.rc
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simple
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS simple.pro
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE simple.ico simple.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simple
 INSTALLS += target sources
diff --git a/examples/activeqt/simple/simple.rc b/examples/activeqt/simple/simple.rc
new file mode 100644
index 0000000..3b40377
--- /dev/null
+++ b/examples/activeqt/simple/simple.rc
@@ -0,0 +1,3 @@
+1 TYPELIB "simple.rc"
+1 ICON DISCARDABLE "simple.ico"
+
diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro
index 5f8b2a0..c1a736c 100644
--- a/examples/activeqt/wrapper/wrapper.pro
+++ b/examples/activeqt/wrapper/wrapper.pro
@@ -8,10 +8,10 @@ contains(CONFIG, static):DEFINES += QT_NODLL
 
 SOURCES	 = main.cpp
 RC_FILE	 = wrapperax.rc
-DEF_FILE = $$QT.activeqt.sources/control/qaxserver.def
+DEF_FILE = wrapperax.def
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/wrapper
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE $$DEF_FILE wrapper.pro
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$RC_FILE $$DEF_FILE wrapperax.ico wrapper.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/wrapper
 INSTALLS += target sources
diff --git a/examples/activeqt/wrapper/wrapperax.def b/examples/activeqt/wrapper/wrapperax.def
new file mode 100644
index 0000000..bc82a03
--- /dev/null
+++ b/examples/activeqt/wrapper/wrapperax.def
@@ -0,0 +1,6 @@
+EXPORTS
+    DllCanUnloadNow      PRIVATE
+    DllGetClassObject    PRIVATE
+    DllRegisterServer    PRIVATE
+    DllUnregisterServer  PRIVATE
+    DumpIDL              PRIVATE
diff --git a/examples/activeqt/wrapper/wrapperax.ico b/examples/activeqt/wrapper/wrapperax.ico
new file mode 100644
index 0000000..c80d36a
--- /dev/null
+++ b/examples/activeqt/wrapper/wrapperax.ico
diff --git a/examples/activeqt/wrapper/wrapperax.rc b/examples/activeqt/wrapper/wrapperax.rc
index 0fb6274..4b8fb02 100644
--- a/examples/activeqt/wrapper/wrapperax.rc
+++ b/examples/activeqt/wrapper/wrapperax.rc
@@ -1,7 +1,7 @@
 #include "winver.h"
 
 1 TYPELIB "wrapperax.rc"
-1 ICON DISCARDABLE "..\\..\\..\\src\\activeqt\\control\\qaxserver.ico"
+1 ICON DISCARDABLE "wrapperax.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 1,0,0,0