diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-30 17:58:17 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-30 18:41:11 +0000 |
commit | 0e14bd586a6e04da3f7c16f98b2392d56a5539d8 (patch) | |
tree | 65700b32bea0a2fdb24461f140a8acde57de5cd7 /src/network | |
parent | 5aeb72fb0fd010505128c218b63bdd11b7c0b85d (diff) | |
download | qtbase-0e14bd586a6e04da3f7c16f98b2392d56a5539d8.tar.gz |
Regenerate qtbase/src projects
To get less diffs for next merges and pro2cmake changes.
Change-Id: I7fb5ff34bb884072a9964e8e3488c69f4290fca2
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 | 6 | ||||
-rw-r--r-- | src/network/CMakeLists.txt | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index 0815b68d56..9beb702c10 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -65,7 +65,6 @@ add_qt_module(Network ) #### Keys ignored in scope 1:.:.:network.pro:<TRUE>: -# MODULE_PLUGIN_TYPES = "bearer" # MODULE_WINRT_CAPABILITIES = "internetClient" "internetClientServer" "privateNetworkClientServer" # QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK" # _LOADED = "qt_module" @@ -90,9 +89,6 @@ if(ANDROID AND (QT_FEATURE_bearermanagement)) ) endif() -#### Keys ignored in scope 3:.:.:network.pro:QT_FEATURE_bearermanagement: -# MODULE_PLUGIN_TYPES = "bearer" - extend_target(Network CONDITION QT_FEATURE_ftp SOURCES access/qftp.cpp access/qftp_p.h @@ -445,7 +441,7 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 LIBRARIES crypt32 ) -add_qt_docs(Network, +add_qt_docs(Network doc/qtnetwork.qdocconf ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index e1e4a151c3..427e7d877b 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -65,7 +65,6 @@ add_qt_module(Network ) #### Keys ignored in scope 1:.:.:network.pro:<TRUE>: -# MODULE_PLUGIN_TYPES = "bearer" # MODULE_WINRT_CAPABILITIES = "internetClient" "internetClientServer" "privateNetworkClientServer" # QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK" # _LOADED = "qt_module" @@ -90,9 +89,6 @@ if(ANDROID AND (QT_FEATURE_bearermanagement)) ) endif() -#### Keys ignored in scope 3:.:.:network.pro:QT_FEATURE_bearermanagement: -# MODULE_PLUGIN_TYPES = "bearer" - extend_target(Network CONDITION QT_FEATURE_ftp SOURCES access/qftp.cpp access/qftp_p.h |