diff options
Diffstat (limited to 'examples/widgets/draganddrop/draggabletext')
4 files changed, 52 insertions, 52 deletions
diff --git a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt index 6763be8444..bc1e72db80 100644 --- a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt @@ -4,16 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(draggabletext LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/draganddrop/draggabletext") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +qt_standard_project_setup() + qt_add_executable(draggabletext dragwidget.cpp dragwidget.h main.cpp @@ -24,12 +18,16 @@ set_target_properties(draggabletext PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(draggabletext PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets +target_link_libraries(draggabletext PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets ) +if(EMSCRIPTEN) + target_link_options(draggabletext PUBLIC -sASYNCIFY -Os) +endif() + # Resources: set(draggabletext_resource_files "words.txt" @@ -43,7 +41,14 @@ qt_add_resources(draggabletext "draggabletext" ) install(TARGETS draggabletext - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET draggabletext + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/draganddrop/draggabletext/draggabletext.pro b/examples/widgets/draganddrop/draggabletext/draggabletext.pro index 1add2a270e..007b9d834e 100644 --- a/examples/widgets/draganddrop/draggabletext/draggabletext.pro +++ b/examples/widgets/draganddrop/draggabletext/draggabletext.pro @@ -4,6 +4,9 @@ HEADERS = dragwidget.h RESOURCES = draggabletext.qrc SOURCES = dragwidget.cpp \ main.cpp +wasm { + QMAKE_LFLAGS += -sASYNCIFY -Os +} # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/draggabletext diff --git a/examples/widgets/draganddrop/draggabletext/main.cpp b/examples/widgets/draganddrop/draggabletext/main.cpp index f6ab39aee1..ebfd481e62 100644 --- a/examples/widgets/draganddrop/draggabletext/main.cpp +++ b/examples/widgets/draganddrop/draggabletext/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(draggabletext); - QApplication app(argc, argv); DragWidget window; window.show(); diff --git a/examples/widgets/draganddrop/draggabletext/words.txt b/examples/widgets/draganddrop/draggabletext/words.txt index 19b8b0325b..78bf304fa9 100644 --- a/examples/widgets/draganddrop/draggabletext/words.txt +++ b/examples/widgets/draganddrop/draggabletext/words.txt @@ -1,41 +1,35 @@ Qt -Quarterly +Academy is -a -paper -based -newsletter -exclusively -available -to +where +you +begin +your +journey +into Qt -customers -Every -quarter -we -mail -out -an -issue +It +is +a +learning +platform that -we -hope -will -bring -added -insight +can +teach +you +everything +from +the +basics +to +the +details and -pleasure +is +open to -your -Qt -programming -with -high -quality -technical -articles -written -by -Qt -experts +students +and +experienced +programmers +alike |