Merge remote-tracking branch 'origin/2.7' into 2.8

Conflicts:
	src/libs/cplusplus/LookupContext.cpp
	src/plugins/plugins.pro
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qnx/qnx_dependencies.pri

Change-Id: I6c406c2503845b08c4852db99c64491a325629c7

src/libs/cplusplus/LookupContext.cpp

@@ -344,7 +344,6 @@ ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope,
                             }
                         }
                     }
-
                 }
             }
         }

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

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);