summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2023-04-03 09:04:48 +0200
committerOliver Wolff <oliver.wolff@qt.io>2023-04-06 10:36:08 +0200
commite7b67edeefcf01a7155c8b6adeffb1304d4d22e4 (patch)
treec62ddcea9806808171e7eb9cf49560d190de7d2f
parent2ee58af673cc26b2a05feb1041217bb8c334d130 (diff)
downloadqtactiveqt-e7b67edeefcf01a7155c8b6adeffb1304d4d22e4.tar.gz
examples: Remove hierarchy example
Functionality is also covered in other examples so that hierarchy is no longer needed. In order to keep the use case's code in source, the example was moved to tests/manual. Pick-to: 6.5 Change-Id: I6b3e46d402877b93cfa4dc555328e1e115ec4fc6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--examples/activeqt/CMakeLists.txt1
-rw-r--r--examples/activeqt/activeqt.pro1
-rw-r--r--examples/activeqt/hierarchy/CMakeLists.txt34
-rw-r--r--tests/manual/CMakeLists.txt1
-rw-r--r--tests/manual/hierarchy/CMakeLists.txt24
-rw-r--r--tests/manual/hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc (renamed from examples/activeqt/hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc)0
-rw-r--r--tests/manual/hierarchy/doc/src/hierarchy.qdoc (renamed from examples/activeqt/hierarchy/doc/src/hierarchy.qdoc)0
-rw-r--r--tests/manual/hierarchy/hierarchy.def (renamed from examples/activeqt/hierarchy/hierarchy.def)0
-rw-r--r--tests/manual/hierarchy/hierarchy.ico (renamed from examples/activeqt/hierarchy/hierarchy.ico)bin766 -> 766 bytes
-rw-r--r--tests/manual/hierarchy/hierarchy.inf (renamed from examples/activeqt/hierarchy/hierarchy.inf)0
-rw-r--r--tests/manual/hierarchy/hierarchy.pro (renamed from examples/activeqt/hierarchy/hierarchy.pro)0
-rw-r--r--tests/manual/hierarchy/hierarchy.rc (renamed from examples/activeqt/hierarchy/hierarchy.rc)0
-rw-r--r--tests/manual/hierarchy/main.cpp (renamed from examples/activeqt/hierarchy/main.cpp)0
-rw-r--r--tests/manual/hierarchy/objects.cpp (renamed from examples/activeqt/hierarchy/objects.cpp)0
-rw-r--r--tests/manual/hierarchy/objects.h (renamed from examples/activeqt/hierarchy/objects.h)0
15 files changed, 25 insertions, 36 deletions
diff --git a/examples/activeqt/CMakeLists.txt b/examples/activeqt/CMakeLists.txt
index de0a97b..b64c0d0 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(hierarchy)
qt_internal_add_example(menus)
qt_internal_add_example(multiple)
qt_internal_add_example(simple)
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index 6f189bc..8dcceff 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -1,6 +1,5 @@
TEMPLATE = subdirs
SUBDIRS += comapp \
- hierarchy \
menus \
multiple \
simple \
diff --git a/examples/activeqt/hierarchy/CMakeLists.txt b/examples/activeqt/hierarchy/CMakeLists.txt
deleted file mode 100644
index 6f3466e..0000000
--- a/examples/activeqt/hierarchy/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-cmake_minimum_required(VERSION 3.16)
-project(hierarchyax LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/activeqt/hierarchy")
-
-find_package(Qt6 REQUIRED COMPONENTS AxServer Core Gui Widgets)
-
-qt6_add_axserver_library(hierarchyax
- main.cpp
- objects.cpp objects.h
- hierarchy.def
- hierarchy.rc
-)
-
-target_link_libraries(hierarchyax PUBLIC
- Qt::Core
- Qt::Gui
- Qt::Widgets
-)
-
-install(TARGETS hierarchyax
- 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 2a55b2d..bf36621 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -3,4 +3,5 @@
add_subdirectory(axviewer)
add_subdirectory(dumpcpp)
+add_subdirectory(hierarchy)
add_subdirectory(testcontrol)
diff --git a/tests/manual/hierarchy/CMakeLists.txt b/tests/manual/hierarchy/CMakeLists.txt
new file mode 100644
index 0000000..3db0a0e
--- /dev/null
+++ b/tests/manual/hierarchy/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## hierarchy Library:
+#####################################################################
+
+set(CMAKE_AUTOMOC ON)
+
+qt_internal_add_manual_test(tst_hierarchy
+ GUI
+ SOURCES
+ main.cpp
+ objects.cpp objects.h
+ hierarchy.def
+ hierarchy.rc
+ LIBRARIES
+ Qt::AxServer
+ Qt::Gui
+ Qt::Widgets
+)
+
+qt_disable_warnings(tst_hierarchy)
+qt6_target_idl(tst_hierarchy)
diff --git a/examples/activeqt/hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc b/tests/manual/hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc
index 9b14316..9b14316 100644
--- a/examples/activeqt/hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc
+++ b/tests/manual/hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc
diff --git a/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc b/tests/manual/hierarchy/doc/src/hierarchy.qdoc
index bc1c6e5..bc1c6e5 100644
--- a/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc
+++ b/tests/manual/hierarchy/doc/src/hierarchy.qdoc
diff --git a/examples/activeqt/hierarchy/hierarchy.def b/tests/manual/hierarchy/hierarchy.def
index bc82a03..bc82a03 100644
--- a/examples/activeqt/hierarchy/hierarchy.def
+++ b/tests/manual/hierarchy/hierarchy.def
diff --git a/examples/activeqt/hierarchy/hierarchy.ico b/tests/manual/hierarchy/hierarchy.ico
index c80d36a..c80d36a 100644
--- a/examples/activeqt/hierarchy/hierarchy.ico
+++ b/tests/manual/hierarchy/hierarchy.ico
Binary files differ
diff --git a/examples/activeqt/hierarchy/hierarchy.inf b/tests/manual/hierarchy/hierarchy.inf
index cb7e90f..cb7e90f 100644
--- a/examples/activeqt/hierarchy/hierarchy.inf
+++ b/tests/manual/hierarchy/hierarchy.inf
diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/tests/manual/hierarchy/hierarchy.pro
index acc108a..acc108a 100644
--- a/examples/activeqt/hierarchy/hierarchy.pro
+++ b/tests/manual/hierarchy/hierarchy.pro
diff --git a/examples/activeqt/hierarchy/hierarchy.rc b/tests/manual/hierarchy/hierarchy.rc
index 70eb503..70eb503 100644
--- a/examples/activeqt/hierarchy/hierarchy.rc
+++ b/tests/manual/hierarchy/hierarchy.rc
diff --git a/examples/activeqt/hierarchy/main.cpp b/tests/manual/hierarchy/main.cpp
index 5ebe6e8..5ebe6e8 100644
--- a/examples/activeqt/hierarchy/main.cpp
+++ b/tests/manual/hierarchy/main.cpp
diff --git a/examples/activeqt/hierarchy/objects.cpp b/tests/manual/hierarchy/objects.cpp
index 6dfda44..6dfda44 100644
--- a/examples/activeqt/hierarchy/objects.cpp
+++ b/tests/manual/hierarchy/objects.cpp
diff --git a/examples/activeqt/hierarchy/objects.h b/tests/manual/hierarchy/objects.h
index 6b8bea6..6b8bea6 100644
--- a/examples/activeqt/hierarchy/objects.h
+++ b/tests/manual/hierarchy/objects.h