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/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 +- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 examples/activeqt/wrapper/wrapperax.def create mode 100644 examples/activeqt/wrapper/wrapperax.ico (limited to 'examples/activeqt/wrapper') 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.1