diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-02-04 13:22:16 +0200 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-02-11 09:10:48 +0200 |
| commit | 84c7967a6c9fc13b2e588b029030546fa6f8b92e (patch) | |
| tree | 0aced5e1a961550af1461e33f5b3925c048ed584 /examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt | |
| parent | 72841fe10402148de78c218d06bf1a1f3d3857d0 (diff) | |
Qt6 related documentation changes for scxml module
Some perhaps less-obvious changes are:
-Remove nonexistent imagedirs reference in qdocconf
-Address some qdoc warnings (“/“ usage in an example and also
std::function handling)
-Fix ftpclient example filename references
-Mark an escaped Q_OBJECT usage as badcode to suppress qdoc warning
The Q_OBJECT itself cannot be unescaped as automoc will then fail.
It shouldn't but that is the case.
-Change the examples’ CMakeLists.txt to use single-line find_packages
to ensure packages are not mixed and matched. Probability for problems
is low but perhaps since these are examples that is appropriate
Pick-to: 6.1
Task-number: QTBUG-89833
Change-Id: Ibf518aa71971e8e9d0af1b49c7de86fd28089e96
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt')
| -rw-r--r-- | examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt b/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt index 1cdd7e6..c860c0d 100644 --- a/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt +++ b/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt @@ -15,10 +15,7 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/trafficlight-widgets-dynamic") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Scxml) +find_package(Qt6 COMPONENTS Core Gui Widgets Scxml) qt_add_executable(trafficlight-widgets-dynamic ../trafficlight-common/trafficlight.cpp ../trafficlight-common/trafficlight.h @@ -29,10 +26,10 @@ set_target_properties(trafficlight-widgets-dynamic PROPERTIES MACOSX_BUNDLE TRUE ) target_link_libraries(trafficlight-widgets-dynamic PUBLIC - Qt::Core - Qt::Gui - Qt::Scxml - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Scxml + Qt6::Widgets ) |