diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-18 18:24:06 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-25 09:46:41 +0000 |
| commit | 3c3d168487b10e7e4d7c06df5a28df9d4220b6de (patch) | |
| tree | 5279adb0525f23d077e99c8af1503e22e96d0864 /src | |
| parent | 902dfced06b73b92ae6cb9adc7a51acff0bcc936 (diff) | |
| download | qtwebchannel-wip/cmake.tar.gz | |
Regenerate projectswip/cmake
Change-Id: Ibdadef34b1b7d4ea98140feed171c409eb8bafde
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/webchannel/.prev_CMakeLists.txt | 26 | ||||
| -rw-r--r-- | src/imports/webchannel/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/webchannel/CMakeLists.txt | 11 |
3 files changed, 33 insertions, 8 deletions
diff --git a/src/imports/webchannel/.prev_CMakeLists.txt b/src/imports/webchannel/.prev_CMakeLists.txt new file mode 100644 index 0000000..a616eb8 --- /dev/null +++ b/src/imports/webchannel/.prev_CMakeLists.txt @@ -0,0 +1,26 @@ +# Generated from webchannel.pro. + +##################################################################### +## webchannel Plugin: +##################################################################### + +qt_add_qml_module(webchannel + URI "QtWebChannel" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + CLASSNAME QWebChannelPlugin + SKIP_TYPE_REGISTRATION + SOURCES + plugin.cpp + INCLUDE_DIRECTORIES + ../../webchannel + LIBRARIES + Qt::WebChannelPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Quick + Qt::WebChannel +) + +#### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>: +# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# TARGETPATH = "QtWebChannel" diff --git a/src/imports/webchannel/CMakeLists.txt b/src/imports/webchannel/CMakeLists.txt index fa48b81..d4986a9 100644 --- a/src/imports/webchannel/CMakeLists.txt +++ b/src/imports/webchannel/CMakeLists.txt @@ -4,10 +4,11 @@ ## webchannel Plugin: ##################################################################### -add_qml_module(declarative_webchannel # special case +qt_add_qml_module(declarative_webchannel # special case URI "QtWebChannel" VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QWebChannelPlugin + SKIP_TYPE_REGISTRATION SOURCES plugin.cpp INCLUDE_DIRECTORIES @@ -23,4 +24,3 @@ add_qml_module(declarative_webchannel # special case #### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>: # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" # TARGETPATH = "QtWebChannel" -# _LOADED = "qml_plugin" diff --git a/src/webchannel/CMakeLists.txt b/src/webchannel/CMakeLists.txt index 4f7f940..45c0373 100644 --- a/src/webchannel/CMakeLists.txt +++ b/src/webchannel/CMakeLists.txt @@ -4,7 +4,7 @@ ## WebChannel Module: ##################################################################### -add_qt_module(WebChannel +qt_add_module(WebChannel SOURCES qmetaobjectpublisher.cpp qmetaobjectpublisher_p.h qwebchannel.cpp qwebchannel.h qwebchannel_p.h @@ -27,7 +27,7 @@ set(resources_resource_files set_source_files_properties(${resources_resource_files} PROPERTIES QT_SKIP_QUICKCOMPILER 1) -add_qt_resource(WebChannel "resources" +qt_add_resource(WebChannel "resources" PREFIX "/qtwebchannel/" FILES @@ -37,12 +37,11 @@ add_qt_resource(WebChannel "resources" #### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>: # OTHER_FILES = "qwebchannel.js" -# _LOADED = "qt_module" ## Scopes: ##################################################################### -extend_target(WebChannel CONDITION TARGET Qt::Qml +qt_extend_target(WebChannel CONDITION TARGET Qt::Qml SOURCES qqmlwebchannel.cpp qqmlwebchannelattached.cpp @@ -54,11 +53,11 @@ extend_target(WebChannel CONDITION TARGET Qt::Qml # PRIVATE_HEADERS = "qqmlwebchannelattached_p.h" # PUBLIC_HEADERS = "qqmlwebchannel.h" -extend_target(WebChannel CONDITION NOT TARGET Qt::Qml +qt_extend_target(WebChannel CONDITION NOT TARGET Qt::Qml DEFINES QT_NO_JSVALUE ) -add_qt_docs( +qt_add_docs(WebChannel doc/qtwebchannel.qdocconf ) |