diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-04 22:57:36 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-05 07:39:14 +0000 |
| commit | 891c897b801c86eaf4c4daea5fab3f2d510fbbe8 (patch) | |
| tree | fd40443526e11f262b18334fda69d6fb6b5d0d5b /src/network | |
| parent | 9231204e2ccab611af0df9a18761cd601ba20e92 (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')
| -rw-r--r-- | src/network/.prev_CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/network/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 1 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 ) + diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 4a642835b6..dc4f08e4cd 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/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,7 +57,7 @@ add_qt_module(Network kernel LIBRARIES Qt::CorePrivate - ZLIB::ZLIB # special case + ZLIB::ZLIB PUBLIC_LIBRARIES Qt::Core ) @@ -432,3 +433,4 @@ extend_target(Network CONDITION WIN32 LIBRARIES ws2_32) # special case: mkspecs/ add_qt_docs( doc/qtnetwork.qdocconf ) + |