diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 167d9c692a8..ce4f6e9ae53 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -344,7 +344,6 @@ ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope, } } } - } } } diff --git a/src/libs/utils/process_stub_unix.c b/src/libs/utils/process_stub_unix.c index 7ab6a3e0bf0..c561ce902c2 100644 --- a/src/libs/utils/process_stub_unix.c +++ b/src/libs/utils/process_stub_unix.c @@ -198,8 +198,6 @@ int main(int argc, char *argv[]) isDebug = !strcmp(argv[ArgAction], "debug"); isDetached = 0; - sendMsg("spid %ld\n", (long)getpid()); - if (*argv[ArgDir] && chdir(argv[ArgDir])) { /* Only expected error: no such file or direcotry */ sendMsg("err:chdir %d\n", errno); @@ -235,6 +233,8 @@ int main(int argc, char *argv[]) env[count] = 0; } + /* send our pid after we read the environment file (creator will get rid of it) */ + sendMsg("spid %ld\n", (long)getpid()); /* * set up the signal handlers diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp index 02398eff938..f1c9f845309 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp @@ -262,6 +262,10 @@ void QmlProfilerEngine::cancelProcess() { QTC_ASSERT(d->m_profilerState, return); + // no process to be canceled? (there might be multiple engines, but only one runs a process) + if (!d->m_runner) + return; + switch (d->m_profilerState->currentState()) { case QmlProfilerStateManager::AppReadyToStop : { d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStopped);