summaryrefslogtreecommitdiffstats
path: root/src/network/.prev_CMakeLists.txt
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-06-04 22:57:36 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-06-05 07:39:14 +0000
commit891c897b801c86eaf4c4daea5fab3f2d510fbbe8 (patch)
treefd40443526e11f262b18334fda69d6fb6b5d0d5b /src/network/.prev_CMakeLists.txt
parent9231204e2ccab611af0df9a18761cd601ba20e92 (diff)
Regenerate the main qtbase modules
There were some changes done in pro2cmake, so regenerate the main qtbase modules to keep everything up to date. Some new whitespace got added. Some special cases were removed (ZLIB). Some opengl code got moved around. Some plugin types were added. And some other minor things. Change-Id: Ie8cba4a9aa6b4b163c39d6cf546ea9e0bfc05c01 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/network/.prev_CMakeLists.txt')
-rw-r--r--src/network/.prev_CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
index 1b901d3050..b1ba59e7be 100644
--- a/src/network/.prev_CMakeLists.txt
+++ b/src/network/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
add_qt_module(Network
+ PLUGIN_TYPES bearer
SOURCES
access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
access/qhsts.cpp access/qhsts_p.h
@@ -56,6 +57,7 @@ add_qt_module(Network
kernel
LIBRARIES
Qt::CorePrivate
+ ZLIB::ZLIB
PUBLIC_LIBRARIES
Qt::Core
)
@@ -427,3 +429,4 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
add_qt_docs(
doc/qtnetwork.qdocconf
)
+