diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2023-04-03 10:26:57 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-04-06 08:36:21 +0000 |
commit | 1bad3a86dcdc6c168090f17e93c86490d601d4f1 (patch) | |
tree | 3e9048c2b73b6277dfc54962cbd951dc2adac37d | |
parent | 73f52eb39f80ce2ba9602c3faf8939b752aa9098 (diff) | |
download | qtactiveqt-1bad3a86dcdc6c168090f17e93c86490d601d4f1.tar.gz |
examples: Remove multiple examples
The functionality of providing multiple ActiveX controls in a single
process server should be covered in a documentation snippet.
In order to keep the use case's code in source, the example was moved to
tests/manual.
Pick-to: 6.5
Change-Id: I2633637e8202aadc7798ba5816a61ec1743f0b03
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r-- | examples/activeqt/CMakeLists.txt | 1 | ||||
-rw-r--r-- | examples/activeqt/activeqt.pro | 1 | ||||
-rw-r--r-- | examples/activeqt/multiple/CMakeLists.txt | 35 | ||||
-rw-r--r-- | tests/manual/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/multiple/CMakeLists.txt | 25 | ||||
-rw-r--r-- | tests/manual/multiple/ax1.h (renamed from examples/activeqt/multiple/ax1.h) | 0 | ||||
-rw-r--r-- | tests/manual/multiple/ax2.h (renamed from examples/activeqt/multiple/ax2.h) | 0 | ||||
-rw-r--r-- | tests/manual/multiple/doc/src/multiple.qdoc (renamed from examples/activeqt/multiple/doc/src/multiple.qdoc) | 0 | ||||
-rw-r--r-- | tests/manual/multiple/main.cpp (renamed from examples/activeqt/multiple/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/multiple/multiple.inf (renamed from examples/activeqt/multiple/multiple.inf) | 0 | ||||
-rw-r--r-- | tests/manual/multiple/multiple.pro (renamed from examples/activeqt/multiple/multiple.pro) | 0 | ||||
-rw-r--r-- | tests/manual/multiple/multipleax.def (renamed from examples/activeqt/multiple/multipleax.def) | 0 | ||||
-rw-r--r-- | tests/manual/multiple/multipleax.ico (renamed from examples/activeqt/multiple/multipleax.ico) | bin | 766 -> 766 bytes | |||
-rw-r--r-- | tests/manual/multiple/multipleax.rc (renamed from examples/activeqt/multiple/multipleax.rc) | 0 |
14 files changed, 26 insertions, 37 deletions
diff --git a/examples/activeqt/CMakeLists.txt b/examples/activeqt/CMakeLists.txt index de6c321..f63a35a 100644 --- a/examples/activeqt/CMakeLists.txt +++ b/examples/activeqt/CMakeLists.txt @@ -3,7 +3,6 @@ if(MSVC) qt_internal_add_example(comapp) - qt_internal_add_example(multiple) qt_internal_add_example(simple) qt_internal_add_example(wrapper) if(TARGET Qt6::OpenGLWidgets AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2) diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro index 90b126a..c42a2aa 100644 --- a/examples/activeqt/activeqt.pro +++ b/examples/activeqt/activeqt.pro @@ -1,6 +1,5 @@ TEMPLATE = subdirs SUBDIRS += comapp \ - multiple \ simple \ wrapper diff --git a/examples/activeqt/multiple/CMakeLists.txt b/examples/activeqt/multiple/CMakeLists.txt deleted file mode 100644 index ed8cf46..0000000 --- a/examples/activeqt/multiple/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(multipleax LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/activeqt/multiple") - -find_package(Qt6 REQUIRED COMPONENTS AxServer Core Gui Widgets) - -qt6_add_axserver_library(multipleax - ax1.h - ax2.h - main.cpp - multipleax.def - multipleax.rc -) - -target_link_libraries(multipleax PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets -) - -install(TARGETS multipleax - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 30a59d3..f911543 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -6,5 +6,6 @@ add_subdirectory(dumpcpp) add_subdirectory(hierarchy) add_subdirectory(mediaplayer) add_subdirectory(menus) +add_subdirectory(multiple) add_subdirectory(opengl) add_subdirectory(testcontrol) diff --git a/tests/manual/multiple/CMakeLists.txt b/tests/manual/multiple/CMakeLists.txt new file mode 100644 index 0000000..8e5d7c7 --- /dev/null +++ b/tests/manual/multiple/CMakeLists.txt @@ -0,0 +1,25 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +##################################################################### +## multiple Binary: +##################################################################### + +set(CMAKE_AUTOMOC ON) + +qt_internal_add_manual_test(tst_multiple + GUI + SOURCES + ax1.h + ax2.h + main.cpp + multipleax.def + multipleax.rc + LIBRARIES + Qt::AxServer + Qt::Gui + Qt::Widgets + +) +# qt_disable_warnings(tst_multiple) +qt6_target_idl(tst_multiple) diff --git a/examples/activeqt/multiple/ax1.h b/tests/manual/multiple/ax1.h index e3a7b10..e3a7b10 100644 --- a/examples/activeqt/multiple/ax1.h +++ b/tests/manual/multiple/ax1.h diff --git a/examples/activeqt/multiple/ax2.h b/tests/manual/multiple/ax2.h index 0509a12..0509a12 100644 --- a/examples/activeqt/multiple/ax2.h +++ b/tests/manual/multiple/ax2.h diff --git a/examples/activeqt/multiple/doc/src/multiple.qdoc b/tests/manual/multiple/doc/src/multiple.qdoc index 8713d9f..8713d9f 100644 --- a/examples/activeqt/multiple/doc/src/multiple.qdoc +++ b/tests/manual/multiple/doc/src/multiple.qdoc diff --git a/examples/activeqt/multiple/main.cpp b/tests/manual/multiple/main.cpp index 6ce4346..6ce4346 100644 --- a/examples/activeqt/multiple/main.cpp +++ b/tests/manual/multiple/main.cpp diff --git a/examples/activeqt/multiple/multiple.inf b/tests/manual/multiple/multiple.inf index 7f6be76..7f6be76 100644 --- a/examples/activeqt/multiple/multiple.inf +++ b/tests/manual/multiple/multiple.inf diff --git a/examples/activeqt/multiple/multiple.pro b/tests/manual/multiple/multiple.pro index f08d3a2..f08d3a2 100644 --- a/examples/activeqt/multiple/multiple.pro +++ b/tests/manual/multiple/multiple.pro diff --git a/examples/activeqt/multiple/multipleax.def b/tests/manual/multiple/multipleax.def index bc82a03..bc82a03 100644 --- a/examples/activeqt/multiple/multipleax.def +++ b/tests/manual/multiple/multipleax.def diff --git a/examples/activeqt/multiple/multipleax.ico b/tests/manual/multiple/multipleax.ico Binary files differindex c80d36a..c80d36a 100644 --- a/examples/activeqt/multiple/multipleax.ico +++ b/tests/manual/multiple/multipleax.ico diff --git a/examples/activeqt/multiple/multipleax.rc b/tests/manual/multiple/multipleax.rc index a9bcc1a..a9bcc1a 100644 --- a/examples/activeqt/multiple/multipleax.rc +++ b/tests/manual/multiple/multipleax.rc |