diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-08-22 13:16:26 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-22 16:26:15 +0200 |
| commit | 26ebb99a49a72e470aedf3b0a6d25fb0db5dc00c (patch) | |
| tree | 892c5dd5a7ee9fec300eae4462ac5b0a476dd44a /examples/activeqt/wrapper | |
| parent | c09c2ef45df66802f0551275448f6c45e5f69bb4 (diff) | |
| download | qtactiveqt-26ebb99a49a72e470aedf3b0a6d25fb0db5dc00c.tar.gz | |
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>
Diffstat (limited to 'examples/activeqt/wrapper')
| -rw-r--r-- | examples/activeqt/wrapper/wrapper.pro | 4 | ||||
| -rw-r--r-- | examples/activeqt/wrapper/wrapperax.def | 6 | ||||
| -rw-r--r-- | examples/activeqt/wrapper/wrapperax.ico | bin | 0 -> 766 bytes | |||
| -rw-r--r-- | examples/activeqt/wrapper/wrapperax.rc | 2 |
4 files changed, 9 insertions, 3 deletions
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 Binary files differnew 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 |