From 510e699d15aa002fada7536d72eee15207986096 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 14 Dec 2016 20:14:16 -0800 Subject: [PATCH] Make network-chat example use QProcessEnvironment This removes an unnecessary dependency on QProcess, which allows the example to work on platforms where process support is not available (such as iOS and tvOS). Change-Id: I5d75fe8373b5f8c3744ab8fb3b1fd1b37eea35f5 Reviewed-by: Thiago Macieira --- examples/network/network-chat/peermanager.cpp | 16 ++++++---------- examples/network/network.pro | 3 +-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/examples/network/network-chat/peermanager.cpp b/examples/network/network-chat/peermanager.cpp index b056d5ed1f9..c70cc5e56da 100644 --- a/examples/network/network-chat/peermanager.cpp +++ b/examples/network/network-chat/peermanager.cpp @@ -63,18 +63,14 @@ PeerManager::PeerManager(Client *client) this->client = client; QStringList envVariables; - envVariables << "USERNAME.*" << "USER.*" << "USERDOMAIN.*" - << "HOSTNAME.*" << "DOMAINNAME.*"; + envVariables << "USERNAME" << "USER" << "USERDOMAIN" + << "HOSTNAME" << "DOMAINNAME"; - QStringList environment = QProcess::systemEnvironment(); + QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); foreach (QString string, envVariables) { - int index = environment.indexOf(QRegExp(string)); - if (index != -1) { - QStringList stringList = environment.at(index).split('='); - if (stringList.size() == 2) { - username = stringList.at(1).toUtf8(); - break; - } + if (environment.contains(string)) { + username = environment.value(string).toUtf8(); + break; } } diff --git a/examples/network/network.pro b/examples/network/network.pro index 5ad5f1939f3..3a269f16aef 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -20,8 +20,7 @@ qtHaveModule(widgets) { multicastsender qtConfig(bearermanagement) { - # no QProcess - !vxworks:!qnx:!winrt:!integrity:!uikit: SUBDIRS += network-chat + qtConfig(processenvironment): SUBDIRS += network-chat SUBDIRS += \ bearermonitor \