From d09694b1d6ffd3cae744e5e1460c673333a9811a Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Tue, 30 Sep 2014 10:55:42 +0200 Subject: Change copyright notice URL points to qt.io Change-Id: I54c58d389f261a5d3fc5e38799cd8edc7204d798 Reviewed-by: Kalle Viironen --- main.cpp | 4 ++-- portlist.cpp | 4 ++-- portlist.h | 4 ++-- process.cpp | 4 ++-- process.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main.cpp b/main.cpp index 51e69d1..dd5ce1e 100644 --- a/main.cpp +++ b/main.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of QtEnterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ diff --git a/portlist.cpp b/portlist.cpp index e0258c9..34488ef 100644 --- a/portlist.cpp +++ b/portlist.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of QtEnterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ diff --git a/portlist.h b/portlist.h index 4846bf0..5784d94 100644 --- a/portlist.h +++ b/portlist.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of QtEnterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ diff --git a/process.cpp b/process.cpp index 0584ccf..31e28bd 100644 --- a/process.cpp +++ b/process.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of QtEnterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ diff --git a/process.h b/process.h index 290fde4..781c121 100644 --- a/process.h +++ b/process.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of QtEnterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ -- cgit v1.2.3 From 1dbc31296d393bb542b0a99f7047dcb13aae3ce3 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Tue, 7 Oct 2014 14:37:23 +0200 Subject: Revert "Always create a process group and session" This change introduces bug QTEE-784. This reverts commit 224cdd83d41d659ec166f7177a549d391ed1d5cc. Change-Id: I925b0fa4b75b22a19374a5229eb651df2352aa00 Reviewed-by: Samuli Piippo --- main.cpp | 4 ++-- process.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/main.cpp b/main.cpp index dd5ce1e..3fa2a14 100644 --- a/main.cpp +++ b/main.cpp @@ -230,8 +230,6 @@ int main(int argc, char **argv) return 1; } - ::setpgid(0,0); // must be called before setsid() - ::setsid(); Config config = parseConfigFile(); while (!args.isEmpty()) { @@ -249,6 +247,8 @@ int main(int argc, char **argv) } } else if (arg == "--debug-gdb") { useGDB = true; + setpgid(0,0); // must be called before setsid() + setsid(); } else if (arg == "--debug-qml") { useQML = true; } else if (arg == "--stop") { diff --git a/process.cpp b/process.cpp index 31e28bd..b7e7342 100644 --- a/process.cpp +++ b/process.cpp @@ -222,14 +222,12 @@ void Process::stop() if (kill(mDebuggee, SIGKILL) != 0) perror("Could not kill debugee"); } + if (kill(-getpid(), SIGTERM) != 0) + perror("Could not kill process group"); mProcess->terminate(); if (!mProcess->waitForFinished()) mProcess->kill(); - - // Just for completeness terminate the whole group - // in case the application has started subprocesses - ::kill(-getpid(), SIGTERM); } void Process::incomingConnection(int i) -- cgit v1.2.3