From 26ebb99a49a72e470aedf3b0a6d25fb0db5dc00c Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 22 Aug 2012 13:16:26 +0300 Subject: Fix installation of ActiveQt examples 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 --- examples/activeqt/hierarchy/hierarchy.def | 6 ++++++ examples/activeqt/hierarchy/hierarchy.ico | Bin 0 -> 766 bytes examples/activeqt/hierarchy/hierarchy.pro | 6 +++--- examples/activeqt/hierarchy/hierarchy.rc | 2 ++ examples/activeqt/menus/menus.ico | Bin 0 -> 766 bytes examples/activeqt/menus/menus.pro | 4 ++-- examples/activeqt/menus/menus.rc | 2 ++ examples/activeqt/multiple/multiple.pro | 4 ++-- examples/activeqt/multiple/multipleax.def | 6 ++++++ examples/activeqt/multiple/multipleax.ico | Bin 0 -> 766 bytes examples/activeqt/multiple/multipleax.rc | 2 +- examples/activeqt/opengl/opengl.ico | Bin 0 -> 766 bytes examples/activeqt/opengl/opengl.pro | 5 +++-- examples/activeqt/opengl/opengl.rc | 2 ++ examples/activeqt/simple/simple.ico | Bin 0 -> 766 bytes examples/activeqt/simple/simple.pro | 4 ++-- examples/activeqt/simple/simple.rc | 3 +++ examples/activeqt/wrapper/wrapper.pro | 4 ++-- examples/activeqt/wrapper/wrapperax.def | 6 ++++++ examples/activeqt/wrapper/wrapperax.ico | Bin 0 -> 766 bytes examples/activeqt/wrapper/wrapperax.rc | 2 +- 21 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 examples/activeqt/hierarchy/hierarchy.def create mode 100644 examples/activeqt/hierarchy/hierarchy.ico create mode 100644 examples/activeqt/hierarchy/hierarchy.rc create mode 100644 examples/activeqt/menus/menus.ico create mode 100644 examples/activeqt/menus/menus.rc create mode 100644 examples/activeqt/multiple/multipleax.def create mode 100644 examples/activeqt/multiple/multipleax.ico create mode 100644 examples/activeqt/opengl/opengl.ico create mode 100644 examples/activeqt/opengl/opengl.rc create mode 100644 examples/activeqt/simple/simple.ico create mode 100644 examples/activeqt/simple/simple.rc create mode 100644 examples/activeqt/wrapper/wrapperax.def create mode 100644 examples/activeqt/wrapper/wrapperax.ico (limited to 'examples') 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 Binary files /dev/null and b/examples/activeqt/hierarchy/hierarchy.ico differ 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 Binary files /dev/null and b/examples/activeqt/menus/menus.ico differ 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 Binary files /dev/null and b/examples/activeqt/multiple/multipleax.ico differ 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 Binary files /dev/null and b/examples/activeqt/opengl/opengl.ico differ 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 Binary files /dev/null and b/examples/activeqt/simple/simple.ico differ 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 Binary files /dev/null and b/examples/activeqt/wrapper/wrapperax.ico differ 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 -- cgit v1.2.3