summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorChristophe Giboudeaux <christophe@krop.fr>2020-11-17 13:44:57 +0100
committerChristophe Giboudeaux <christophe@krop.fr>2020-11-18 18:21:23 +0100
commit8a6f52bf83f7f8e97e4eed7bafbcdfd85a5a5bab (patch)
tree2c3e8fc2767f10d7deaf9154010b1501a3852814 /src/network
parent86b8c5c3f32c245795e9eab2a74e4b6982e5a496 (diff)
Remove obsolete warnings
The libproxy issue was fixed 4 years ago and the related Qt and libproxy bug reports were also closed long ago. Change-Id: I5af18f1eaaffb8d33556ab94ca1759959a2c272d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/configure.cmake5
-rw-r--r--src/network/configure.json5
2 files changed, 0 insertions, 10 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake
index d66874b462..ea71cd1ff8 100644
--- a/src/network/configure.cmake
+++ b/src/network/configure.cmake
@@ -439,8 +439,3 @@ qt_configure_add_report_entry(
MESSAGE "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS. For example: OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked"
CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND ( NOT TEST_openssl.source EQUAL 0 ) AND INPUT_openssl.prefix STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME
)
-qt_configure_add_report_entry(
- TYPE WARNING
- MESSAGE "Some of libproxy's plugins may use incompatible Qt versions. Some platforms and distributions ship libproxy with plugins, such as config_kde4.so, that are linked against old versions of Qt, and libproxy loads these plugins automatically when initialized. If Qt is not in a namespace, that loading causes a crash. Even if the systems on which you build and test have no such plugins, your users' systems may have them. We therefore recommend that you combine -libproxy with -qtnamespace when configuring Qt."
- CONDITION QT_FEATURE_libproxy AND INPUT_qt_namespace STREQUAL ''
-)
diff --git a/src/network/configure.json b/src/network/configure.json
index 835e449e5d..3234fa6474 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -453,11 +453,6 @@
library names through OPENSSL_LIBS.
For example:
OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked"
- },
- {
- "type": "warning",
- "condition": "features.libproxy && input.qt_namespace == ''",
- "message": "Some of libproxy's plugins may use incompatible Qt versions. Some platforms and distributions ship libproxy with plugins, such as config_kde4.so, that are linked against old versions of Qt; and libproxy loads these plugins automatically when initialized. If Qt is not in a namespace, that loading causes a crash. Even if the systems on which you build and test have no such plugins, your users' systems may have them. We therefore recommend that you combine -libproxy with -qtnamespace when configuring Qt."
}
],