Merge "Missing about.html"
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
index 9095be9..758b993 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
@@ -253,9 +253,9 @@
 	private final IRemoteConnection fRemoteConnection;
 	private final IJSchService fJSchService;
 
-	private final Map<String, String> fEnv = new HashMap<String, String>();
-	private final Map<String, String> fProperties = new HashMap<String, String>();
-	private final List<Session> fSessions = new ArrayList<Session>();
+	private final Map<String, String> fEnv = new HashMap<>();
+	private final Map<String, String> fProperties = new HashMap<>();
+	private final List<Session> fSessions = new ArrayList<>();
 
 	private ChannelSftp fSftpCommandChannel;
 	private boolean isFullySetup; // including sftp channel and environment
@@ -897,6 +897,12 @@
 			encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
 			break;
 
+		case "qnx": //$NON-NLS-1$
+			osArch = executeCommand("uname -p", subMon.newChild(10)); //$NON-NLS-1$
+			osVersion = executeCommand("uname -r", subMon.newChild(10)); //$NON-NLS-1$
+			encoding = "UTF-8"; //$NON-NLS-1$
+			break;
+
 		default:
 			osVersion = "unknown"; //$NON-NLS-1$
 			osArch = "unknown"; //$NON-NLS-1$