diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-04-13 15:59:08 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-04-13 15:59:08 +0200 |
| commit | 2bc37de42b5dd1f0d0a8cea29e5a2cc4926836b5 (patch) | |
| tree | e613605a0c295a2af7010e92d7b5d412654bf137 /doc | |
| parent | b1415a0ea58e0860c790b1b5ff5fbd3d4bfdd87a (diff) | |
| parent | 02f2a93503a24d2da3b93db2cbfe8463627cf990 (diff) | |
| download | qt-creator-2bc37de42b5dd1f0d0a8cea29e5a2cc4926836b5.tar.gz | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
src/plugins/python/pipsupport.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/examplesparser.cpp
tests/auto/examples/tst_examples.cpp
Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/qtcreator/examples/accelbubble/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | doc/qtcreator/examples/textfinder/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | doc/qtcreator/examples/transitions/CMakeLists.txt | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/doc/qtcreator/examples/accelbubble/CMakeLists.txt b/doc/qtcreator/examples/accelbubble/CMakeLists.txt index 868e5ea133..9e67614807 100644 --- a/doc/qtcreator/examples/accelbubble/CMakeLists.txt +++ b/doc/qtcreator/examples/accelbubble/CMakeLists.txt @@ -40,6 +40,8 @@ target_link_libraries(appaccelbubble install(TARGETS appaccelbubble BUNDLE DESTINATION . - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) qt_finalize_executable(appaccelbubble) diff --git a/doc/qtcreator/examples/textfinder/CMakeLists.txt b/doc/qtcreator/examples/textfinder/CMakeLists.txt index 77a0ba8c15..a00ccd856b 100644 --- a/doc/qtcreator/examples/textfinder/CMakeLists.txt +++ b/doc/qtcreator/examples/textfinder/CMakeLists.txt @@ -62,7 +62,9 @@ set_target_properties(TextFinder PROPERTIES install(TARGETS TextFinder BUNDLE DESTINATION . - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) if(QT_VERSION_MAJOR EQUAL 6) qt_finalize_executable(TextFinder) diff --git a/doc/qtcreator/examples/transitions/CMakeLists.txt b/doc/qtcreator/examples/transitions/CMakeLists.txt index 3dec945039..8b363fc8e2 100644 --- a/doc/qtcreator/examples/transitions/CMakeLists.txt +++ b/doc/qtcreator/examples/transitions/CMakeLists.txt @@ -33,4 +33,6 @@ target_link_libraries(apptransitions install(TARGETS apptransitions BUNDLE DESTINATION . - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) |