summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2023-04-03 09:45:20 +0200
committerOliver Wolff <oliver.wolff@qt.io>2023-04-06 10:36:17 +0200
commit73f52eb39f80ce2ba9602c3faf8939b752aa9098 (patch)
treeb1889fb77079412bdb9b3c002a346fea5e94083a
parent4fa7ebcf6390ed415ffd8d6bdc4987b789dad309 (diff)
downloadqtactiveqt-73f52eb39f80ce2ba9602c3faf8939b752aa9098.tar.gz
examples: Remove menus example
Showing the usage of QMenuBar and QStatusBar in a QMainWindow can be merged into another if 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: I76ec12e9c83a42028f2de95ab17ca07544b53425 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/menus/CMakeLists.txt34
-rw-r--r--tests/manual/CMakeLists.txt2
-rw-r--r--tests/manual/menus/CMakeLists.txt25
-rw-r--r--tests/manual/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc (renamed from examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc)0
-rw-r--r--tests/manual/menus/doc/src/menus.qdoc (renamed from examples/activeqt/menus/doc/src/menus.qdoc)0
-rw-r--r--tests/manual/menus/fileopen.xpm (renamed from examples/activeqt/menus/fileopen.xpm)0
-rw-r--r--tests/manual/menus/filesave.xpm (renamed from examples/activeqt/menus/filesave.xpm)0
-rw-r--r--tests/manual/menus/main.cpp (renamed from examples/activeqt/menus/main.cpp)0
-rw-r--r--tests/manual/menus/menus.cpp (renamed from examples/activeqt/menus/menus.cpp)0
-rw-r--r--tests/manual/menus/menus.def (renamed from examples/activeqt/menus/menus.def)0
-rw-r--r--tests/manual/menus/menus.h (renamed from examples/activeqt/menus/menus.h)0
-rw-r--r--tests/manual/menus/menus.ico (renamed from examples/activeqt/menus/menus.ico)bin766 -> 766 bytes
-rw-r--r--tests/manual/menus/menus.inf (renamed from examples/activeqt/menus/menus.inf)0
-rw-r--r--tests/manual/menus/menus.pro (renamed from examples/activeqt/menus/menus.pro)0
-rw-r--r--tests/manual/menus/menus.rc (renamed from examples/activeqt/menus/menus.rc)0
17 files changed, 27 insertions, 36 deletions
diff --git a/examples/activeqt/CMakeLists.txt b/examples/activeqt/CMakeLists.txt
index 76a9808..de6c321 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(menus)
qt_internal_add_example(multiple)
qt_internal_add_example(simple)
qt_internal_add_example(wrapper)
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index 251808c..90b126a 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -1,6 +1,5 @@
TEMPLATE = subdirs
SUBDIRS += comapp \
- menus \
multiple \
simple \
wrapper
diff --git a/examples/activeqt/menus/CMakeLists.txt b/examples/activeqt/menus/CMakeLists.txt
deleted file mode 100644
index bb06f93..0000000
--- a/examples/activeqt/menus/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(menusax LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/activeqt/menus")
-
-find_package(Qt6 REQUIRED COMPONENTS AxServer Core Gui Widgets)
-
-qt6_add_axserver_executable(menusax
- main.cpp
- menus.cpp menus.h
- menus.def
- menus.rc
-)
-
-target_link_libraries(menusax PUBLIC
- Qt::Core
- Qt::Gui
- Qt::Widgets
-)
-
-install(TARGETS menusax
- 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 4db4d20..30a59d3 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -5,4 +5,6 @@ add_subdirectory(axviewer)
add_subdirectory(dumpcpp)
add_subdirectory(hierarchy)
add_subdirectory(mediaplayer)
+add_subdirectory(menus)
+add_subdirectory(opengl)
add_subdirectory(testcontrol)
diff --git a/tests/manual/menus/CMakeLists.txt b/tests/manual/menus/CMakeLists.txt
new file mode 100644
index 0000000..a8b3899
--- /dev/null
+++ b/tests/manual/menus/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## menus Executable:
+#####################################################################
+
+set(CMAKE_AUTOMOC ON)
+
+qt_internal_add_manual_test(tst_menus
+ GUI
+ SOURCES
+ main.cpp
+ menus.cpp menus.h
+ menus.def
+ menus.rc
+ LIBRARIES
+ Qt::AxServer
+ Qt::Core
+ Qt::Gui
+ Qt::Widgets
+)
+
+qt_disable_warnings(tst_menus)
+qt6_target_idl(tst_menus)
diff --git a/examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc b/tests/manual/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc
index a889f0f..a889f0f 100644
--- a/examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc
+++ b/tests/manual/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc
diff --git a/examples/activeqt/menus/doc/src/menus.qdoc b/tests/manual/menus/doc/src/menus.qdoc
index fdbe4ce..fdbe4ce 100644
--- a/examples/activeqt/menus/doc/src/menus.qdoc
+++ b/tests/manual/menus/doc/src/menus.qdoc
diff --git a/examples/activeqt/menus/fileopen.xpm b/tests/manual/menus/fileopen.xpm
index 880417e..880417e 100644
--- a/examples/activeqt/menus/fileopen.xpm
+++ b/tests/manual/menus/fileopen.xpm
diff --git a/examples/activeqt/menus/filesave.xpm b/tests/manual/menus/filesave.xpm
index bd6870f..bd6870f 100644
--- a/examples/activeqt/menus/filesave.xpm
+++ b/tests/manual/menus/filesave.xpm
diff --git a/examples/activeqt/menus/main.cpp b/tests/manual/menus/main.cpp
index 70e84eb..70e84eb 100644
--- a/examples/activeqt/menus/main.cpp
+++ b/tests/manual/menus/main.cpp
diff --git a/examples/activeqt/menus/menus.cpp b/tests/manual/menus/menus.cpp
index 3093862..3093862 100644
--- a/examples/activeqt/menus/menus.cpp
+++ b/tests/manual/menus/menus.cpp
diff --git a/examples/activeqt/menus/menus.def b/tests/manual/menus/menus.def
index bc82a03..bc82a03 100644
--- a/examples/activeqt/menus/menus.def
+++ b/tests/manual/menus/menus.def
diff --git a/examples/activeqt/menus/menus.h b/tests/manual/menus/menus.h
index b21a9c3..b21a9c3 100644
--- a/examples/activeqt/menus/menus.h
+++ b/tests/manual/menus/menus.h
diff --git a/examples/activeqt/menus/menus.ico b/tests/manual/menus/menus.ico
index c80d36a..c80d36a 100644
--- a/examples/activeqt/menus/menus.ico
+++ b/tests/manual/menus/menus.ico
Binary files differ
diff --git a/examples/activeqt/menus/menus.inf b/tests/manual/menus/menus.inf
index f97efe8..f97efe8 100644
--- a/examples/activeqt/menus/menus.inf
+++ b/tests/manual/menus/menus.inf
diff --git a/examples/activeqt/menus/menus.pro b/tests/manual/menus/menus.pro
index f5a7890..f5a7890 100644
--- a/examples/activeqt/menus/menus.pro
+++ b/tests/manual/menus/menus.pro
diff --git a/examples/activeqt/menus/menus.rc b/tests/manual/menus/menus.rc
index d466b35..d466b35 100644
--- a/examples/activeqt/menus/menus.rc
+++ b/tests/manual/menus/menus.rc