diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 16:32:06 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 14:40:28 +0000 |
commit | 432b75517cba65e8ab633a2fe0d53f18abd59426 (patch) | |
tree | 2ba828e91dc228237e63a346c0ab7bc09fde83c5 /src | |
parent | 5feeb5867d032cc4641ee088cfa5bd9063bcf5cd (diff) | |
download | qtwebsockets-432b75517cba65e8ab633a2fe0d53f18abd59426.tar.gz |
Regenerate before merge
Change-Id: I9f22f5d050aeec3e8c308e286a897f0f524ed8e3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/qmlwebsockets/.prev_CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/qmlwebsockets/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/websockets/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/qmlwebsockets/.prev_CMakeLists.txt b/src/imports/qmlwebsockets/.prev_CMakeLists.txt index aa1785d..e6da39b 100644 --- a/src/imports/qmlwebsockets/.prev_CMakeLists.txt +++ b/src/imports/qmlwebsockets/.prev_CMakeLists.txt @@ -8,6 +8,7 @@ add_qml_module(qmlwebsockets URI "QtWebSockets" VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QtWebSocketsDeclarativeModule + SKIP_TYPE_REGISTRATION SOURCES qmlwebsockets_plugin.cpp qmlwebsockets_plugin.h qqmlwebsocket.cpp qqmlwebsocket.h diff --git a/src/imports/qmlwebsockets/CMakeLists.txt b/src/imports/qmlwebsockets/CMakeLists.txt index 228ff38..803f86c 100644 --- a/src/imports/qmlwebsockets/CMakeLists.txt +++ b/src/imports/qmlwebsockets/CMakeLists.txt @@ -8,6 +8,7 @@ add_qml_module(qmlwebsockets URI "QtWebSockets" VERSION "1.0" #special case CLASSNAME QtWebSocketsDeclarativeModule + SKIP_TYPE_REGISTRATION SOURCES qmlwebsockets_plugin.cpp qmlwebsockets_plugin.h qqmlwebsocket.cpp qqmlwebsocket.h diff --git a/src/websockets/CMakeLists.txt b/src/websockets/CMakeLists.txt index 9d87ebb..3d0f212 100644 --- a/src/websockets/CMakeLists.txt +++ b/src/websockets/CMakeLists.txt @@ -43,7 +43,7 @@ extend_target(WebSockets CONDITION QT_FEATURE_ssl #### Keys ignored in scope 3:.:.:websockets.pro:QT_FEATURE_ssl: # PRIVATE_HEADERS = "$$PWD/qsslserver_p.h" -add_qt_docs( +add_qt_docs(WebSockets doc/qtwebsockets.qdocconf ) |