diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-24 16:42:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-24 20:51:43 +0200 |
| commit | 6c00e510619f2bf9f997c1df5b00f03780d57dd3 (patch) | |
| tree | 7f9dac7b5b10cdfe1fef505dd8527402ed459825 /src | |
| parent | f7f36efe0e933b86b88b7f2156bc0d646a3b45ee (diff) | |
| download | qtwebsockets-6c00e510619f2bf9f997c1df5b00f03780d57dd3.tar.gz | |
CMake: Regenerate projects
Mostly needed for src/ project, to build websockets without checking
for the textcodec feature.
Amends aeeaa00fa083ac339d0770d633d22f203c504253
Change-Id: I90cd219294575c763501e47b9025e8a50017641a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/websockets/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0954e5b..0b457c8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,6 @@ # Generated from src.pro. -if(QT_FEATURE_textcodec) - add_subdirectory(websockets) -endif() -if(QT_FEATURE_textcodec AND TARGET Qt::Quick) +add_subdirectory(websockets) +if(TARGET Qt::Quick) add_subdirectory(imports) endif() diff --git a/src/websockets/CMakeLists.txt b/src/websockets/CMakeLists.txt index 0038bcc..66a9e2d 100644 --- a/src/websockets/CMakeLists.txt +++ b/src/websockets/CMakeLists.txt @@ -43,7 +43,7 @@ qt_extend_target(WebSockets CONDITION QT_FEATURE_ssl ) #### Keys ignored in scope 3:.:.:websockets.pro:QT_FEATURE_ssl: -# PRIVATE_HEADERS = "$$PWD/qsslserver_p.h" +# PRIVATE_HEADERS = "qsslserver_p.h" qt_add_docs(WebSockets doc/qtwebsockets.qdocconf ) |