Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	examples/opcua/opcuaviewer/mainwindow.cpp
	src/imports/opcua/opcua_plugin.cpp
	src/imports/opcua/opcuaconnection.h

Change-Id: I1e5b4be0390ee62ae462b0d2f2ec6fa402958fa4

1 files changed, 1 insertions, 1 deletions

diff --git a/examples/opcua/opcuaviewer/mainwindow.cpp b/examples/opcua/opcuaviewer/mainwindow.cpp
index 3510bb3..ac367fa 100644
--- a/examples/opcua/opcuaviewer/mainwindow.cpp
+++ b/examples/opcua/opcuaviewer/mainwindow.cpp
@@ -220,7 +220,7 @@ void MainWindow::createClient()
         mOpcUaClient->setIdentity(m_identity);
         mOpcUaClient->setPkiConfiguration(m_pkiConfig);
 
-        if (mOpcUaPlugin->currentText() == QStringLiteral("uacpp")) {
+        if (mOpcUaClient->supportedUserTokenTypes().contains(QOpcUaUserTokenPolicy::TokenType::Certificate)) {
             QOpcUaAuthenticationInformation authInfo;
             authInfo.setCertificateAuthentication();
             mOpcUaClient->setAuthenticationInformation(authInfo);