diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-29 10:01:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-29 20:11:17 +0100 |
| commit | f64a9054e3b049fff4eb258658a020b403196b53 (patch) | |
| tree | f74617f0217ec3081484d68a617a682fb3561f5a /src/webchannel | |
| parent | ac9eeb58ad5bc82c5c5df9f4f37079fadaaa1e11 (diff) | |
| parent | 100d0d2ea35834d06c864a12d6f6829692c2d990 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
Diffstat (limited to 'src/webchannel')
| -rw-r--r-- | src/webchannel/CMakeLists.txt | 65 | ||||
| -rw-r--r-- | src/webchannel/webchannel.pro | 3 |
2 files changed, 68 insertions, 0 deletions
diff --git a/src/webchannel/CMakeLists.txt b/src/webchannel/CMakeLists.txt new file mode 100644 index 0000000..9fba217 --- /dev/null +++ b/src/webchannel/CMakeLists.txt @@ -0,0 +1,65 @@ +# Generated from webchannel.pro. + +##################################################################### +## WebChannel Module: +##################################################################### + +qt_add_module(WebChannel + SOURCES + qmetaobjectpublisher.cpp qmetaobjectpublisher_p.h + qwebchannel.cpp qwebchannel.h qwebchannel_p.h + qwebchannelabstracttransport.cpp qwebchannelabstracttransport.h + signalhandler_p.h + variantargument_p.h + LIBRARIES + Qt::CorePrivate + PUBLIC_LIBRARIES + Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate +) + +# Resources: +set_source_files_properties("../../examples/webchannel/shared/qwebchannel.js" + PROPERTIES QT_RESOURCE_ALIAS "qwebchannel.js" +) +set(resources_resource_files + "../../examples/webchannel/shared/qwebchannel.js" +) + +set_source_files_properties(${resources_resource_files} PROPERTIES QT_SKIP_QUICKCOMPILER 1) + +qt_add_resource(WebChannel "resources" + PREFIX + "/qtwebchannel/" + FILES + ${resources_resource_files} +) + + +#### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>: +# OTHER_FILES = "qwebchannel.js" + +## Scopes: +##################################################################### + +qt_extend_target(WebChannel CONDITION TARGET Qt::Qml + SOURCES + qqmlwebchannel.cpp + qqmlwebchannelattached.cpp + PUBLIC_LIBRARIES + Qt::Qml +) + +#### Keys ignored in scope 2:.:.:webchannel.pro:TARGET Qt::Qml: +# PRIVATE_HEADERS = "qqmlwebchannelattached_p.h" +# PUBLIC_HEADERS = "qqmlwebchannel.h" + +qt_extend_target(WebChannel CONDITION NOT TARGET Qt::Qml + DEFINES + QT_NO_JSVALUE +) +qt_add_docs(WebChannel + doc/qtwebchannel.qdocconf +) + diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro index 9c555e7..00e75f5 100644 --- a/src/webchannel/webchannel.pro +++ b/src/webchannel/webchannel.pro @@ -7,6 +7,9 @@ QMAKE_DOCS = $$PWD/doc/qtwebchannel.qdocconf RESOURCES += \ resources.qrc +QTQUICK_COMPILER_SKIPPED_RESOURCES += \ + resources.qrc + OTHER_FILES = \ qwebchannel.js |