summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJannis Völker <jannis.voelker@basyskom.com>2018-08-14 05:24:37 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-08-14 15:08:28 +0000
commit7736c937ef176bcff50926fc9d6a81a0c267389e (patch)
treee0777a329f94b9888ad299bd9807c73d3ffcf83d /src
parent701a0f6fc26a6bc2733b16fc8ac34c8477a9ae60 (diff)
parentd7c3eaef4e7d33dadb25bcfd3fa33155ef46b082 (diff)
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src')
-rw-r--r--src/opcua/client/qopcuaclient.cpp11
-rw-r--r--src/opcua/client/qopcuatype.cpp4
2 files changed, 13 insertions, 2 deletions
diff --git a/src/opcua/client/qopcuaclient.cpp b/src/opcua/client/qopcuaclient.cpp
index 77c7342..741d591 100644
--- a/src/opcua/client/qopcuaclient.cpp
+++ b/src/opcua/client/qopcuaclient.cpp
@@ -233,6 +233,17 @@ QOpcUaClient::~QOpcUaClient()
/*!
Connects to the OPC UA endpoint given in \a url.
+
+ If the endpoint requires username and password, they must be included in \a url.
+
+ \code
+ QUrl url("opc.tcp://localhost:4840");
+ url.setUserName("user");
+ url.setPassword("password");
+
+ m_client->connectToEndpoint(url);
+ \endcode
+
\sa disconnectFromEndpoint()
*/
void QOpcUaClient::connectToEndpoint(const QUrl &url)
diff --git a/src/opcua/client/qopcuatype.cpp b/src/opcua/client/qopcuatype.cpp
index 30d1841..96bd943 100644
--- a/src/opcua/client/qopcuatype.cpp
+++ b/src/opcua/client/qopcuatype.cpp
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
This enum contains the reference types specified in OPC-UA part 3, 7.
They are used to filter for a certain reference type in \l QOpcUaNode::browseChildren
- and for the reference type information in \a QOpcUaReferenceDescription.
+ and for the reference type information in \l QOpcUaReferenceDescription.
\value Unspecified Not a valid reference type.
\value References The abstract base type for all references.
@@ -182,7 +182,7 @@ QT_BEGIN_NAMESPACE
/*!
\enum QOpcUa::UaStatusCode
- Enumerates all status codes from https://opcfoundation.org/UA/schemas/1.03/Opc.Ua.StatusCodes.csv
+ Enumerates all status codes from \l {https://opcfoundation.org/UA/schemas/1.03/Opc.Ua.StatusCodes.csv}
\value Good
\value BadUnexpectedError