summaryrefslogtreecommitdiffstats
path: root/src/sdk/main.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-02-10 16:21:26 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2015-02-20 10:22:28 +0000
commitd6bca86cad962a0078c2a8111133cff123f1ba0a (patch)
tree0f8cf9863c04675c24efe2bf6b0aa023a56a0f4c /src/sdk/main.cpp
parent0ff36e52afb503a99c8fded093d25321a46b3d19 (diff)
Use local sockets for client-server communication
Change-Id: I12bfef671ab31ae9fb8c4bb02776517e7f434d27 Task-number: QTIFW-228 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/sdk/main.cpp')
-rw-r--r--src/sdk/main.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
index 6932f0d37..a35f1a95a 100644
--- a/src/sdk/main.cpp
+++ b/src/sdk/main.cpp
@@ -119,22 +119,22 @@ int main(int argc, char *argv[])
const QStringList arguments = parser.value(QLatin1String(CommandLineOptions::StartServer))
.split(QLatin1Char(','), QString::SkipEmptyParts);
- QString port, key;
+ QString socketName, key;
const QString mode = arguments.value(0);
bool argumentsValid = (mode.compare(QLatin1String(QInstaller::Protocol::ModeDebug),
Qt::CaseInsensitive) == 0);
if (argumentsValid) {
- port = arguments.value(1, QString::number(QInstaller::Protocol::DefaultPort));
+ socketName = arguments.value(1, QLatin1String(QInstaller::Protocol::DefaultSocket));
key = arguments.value(2, QLatin1String(QInstaller::Protocol::DefaultAuthorizationKey));
} else {
- port = arguments.value(1);
+ socketName = arguments.value(1);
key = arguments.value(2);
}
const bool production = (mode.compare(QLatin1String(QInstaller::Protocol::ModeProduction),
Qt::CaseInsensitive) == 0);
if (production)
- argumentsValid = (!key.isEmpty()) && (!port.isEmpty());
+ argumentsValid = (!key.isEmpty()) && (!socketName.isEmpty());
SDKApp<QCoreApplication> app(argc, argv);
if (!argumentsValid) {
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
QInstaller::RemoteServer *server = new QInstaller::RemoteServer;
QObject::connect(server, SIGNAL(destroyed()), &app, SLOT(quit()));
- server->init(port.toInt(), key, (production ? QInstaller::Protocol::Mode::Production
+ server->init(socketName, key, (production ? QInstaller::Protocol::Mode::Production
: QInstaller::Protocol::Mode::Debug));
server->start();