summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/network')
-rw-r--r--src/network/.prev_CMakeLists.txt6
-rw-r--r--src/network/CMakeLists.txt4
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