summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Di Sera <luca.disera@qt.io>2021-09-22 16:20:50 +0200
committerPaul Wicking <paul.wicking@qt.io>2021-09-24 14:11:52 +0200
commit906509655d7a2a8da8b17315ef73cffe735a5461 (patch)
treeeeccf58ca704d5eb7eacaec78987daf111dc9ee2
parent55e01c24355b8dca73e9a996d4a6c3eaa1b1dded (diff)
Doc: Update Microsoft's Documentation Links
The documentation links on `msdn.microsoft.com` now redirect to `docs.microsoft.com`. While the redirection works, our script to catch broken links on dev-snapshots builds of the documentation doesn't handle redirection correctly, reporting it as broken. Both to appease the broken-links script and to avoid an unneccesary redirection, the links were modified to point to the equivalent address in the new domain. Furthermore, the link to the `Winsock 2 Socket Handle` was moved to be an `\externalpage` link, as it was used in two different places. Additionally, the `\externalpage` link titled `Dirext X SDK` was removed as it was not used in any part of the documentation. Task-number: QTBUG-96127 Change-Id: I07f0ae8d610a7f8322b892a2fa37a5cc1769289e Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fc73b585f8c0a6b08c2f931ac557793b74c5204a)
-rw-r--r--doc/global/externalsites/external-resources.qdoc4
-rw-r--r--src/network/socket/qlocalserver.cpp3
-rw-r--r--src/network/socket/qlocalsocket.cpp3
-rw-r--r--src/plugins/platforms/windows/qwindowsmenu.cpp2
4 files changed, 5 insertions, 7 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index f3682e593a..94c7708c25 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -213,8 +213,8 @@
*/
/*!
- \externalpage http://msdn.microsoft.com/en-us/directx/default.aspx
- \title Direct X SDK
+ \externalpage https://docs.microsoft.com/en-us/windows/win32/winsock/socket-handles-2
+ \title Winsock 2 Socket Handle
*/
/*!
diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp
index 6517d6dc6a..b4f9f30927 100644
--- a/src/network/socket/qlocalserver.cpp
+++ b/src/network/socket/qlocalserver.cpp
@@ -210,8 +210,7 @@ QBindable<QLocalServer::SocketOptions> QLocalServer::bindableSocketOptions()
The type of the descriptor depends on the platform:
\list
\li On Windows, the returned value is a
- \l{https://msdn.microsoft.com/en-us/library/windows/desktop/ms740522(v=vs.85).aspx}
- {Winsock 2 Socket Handle}.
+ \l{Winsock 2 Socket Handle}.
\li On INTEGRITY, the returned value is the
QTcpServer socket descriptor and the type is defined by
diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp
index 98c686de63..078461cb92 100644
--- a/src/network/socket/qlocalsocket.cpp
+++ b/src/network/socket/qlocalsocket.cpp
@@ -147,8 +147,7 @@ QT_BEGIN_NAMESPACE
\list
\li On Windows, the returned value is a
- \l{https://msdn.microsoft.com/en-us/library/windows/desktop/ms740522(v=vs.85).aspx}
- {Winsock 2 Socket Handle}.
+ \l{Winsock 2 Socket Handle}.
\li On INTEGRITY, the returned value is the
QTcpSocket socket descriptor and the type is defined by
diff --git a/src/plugins/platforms/windows/qwindowsmenu.cpp b/src/plugins/platforms/windows/qwindowsmenu.cpp
index 31d9d3e09b..a0ace1f06a 100644
--- a/src/plugins/platforms/windows/qwindowsmenu.cpp
+++ b/src/plugins/platforms/windows/qwindowsmenu.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
\brief Windows native menu bar
\list
- \li \l{https://msdn.microsoft.com/de-de/library/windows/desktop/ms647553(v=vs.85).aspx#_win32_Menu_Creation_Functions},
+ \li \l{https://docs.microsoft.com/en-us/windows/win32/menurc/about-menus},
\e{About Menus}
\endlist