Merge 1.8 into master

Change-Id: I79817dea8855d7327d3b8d53f30f29ecebd5daaf

2 files changed, 5 insertions, 1 deletions

diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp
index 54ce7bfe1..f6978ffc8 100644
--- a/src/lib/corelib/api/internaljobs.cpp
+++ b/src/lib/corelib/api/internaljobs.cpp
@@ -196,7 +196,7 @@ void InternalJobThreadWrapper::start()
     setTimed(m_job->timed());
     m_thread.start();
     m_running = true;
-    emit startRequested();
+    QTimer::singleShot(0, this, &InternalJobThreadWrapper::startRequested);
 }
 
 void InternalJobThreadWrapper::handleFinished()
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 017db6f42..fba895e2f 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -153,6 +153,7 @@ BuildJob *ProjectPrivate::buildProducts(const QList<ResolvedProductPtr> &product
 
     BuildJob * const job = new BuildJob(logger, jobOwner);
     job->build(internalProject, productsToBuild, options);
+    QBS_ASSERT(job->state() == AbstractJob::StateRunning,);
     return job;
 }
 
@@ -161,6 +162,7 @@ CleanJob *ProjectPrivate::cleanProducts(const QList<ResolvedProductPtr> &product
 {
     CleanJob * const job = new CleanJob(logger, jobOwner);
     job->clean(internalProject, products, options);
+    QBS_ASSERT(job->state() == AbstractJob::StateRunning,);
     return job;
 }
 
@@ -172,6 +174,7 @@ InstallJob *ProjectPrivate::installProducts(const QList<ResolvedProductPtr> &pro
         addDependencies(productsToInstall);
     InstallJob * const job = new InstallJob(logger, jobOwner);
     job->install(internalProject, productsToInstall, options);
+    QBS_ASSERT(job->state() == AbstractJob::StateRunning,);
     return job;
 }
 
@@ -916,6 +919,7 @@ SetupProjectJob *Project::setupProject(const SetupProjectParameters &parameters,
     try {
         loadPlugins(parameters.pluginPaths(), logger);
         job->resolve(*this, parameters);
+        QBS_ASSERT(job->state() == AbstractJob::StateRunning,);
     } catch (const ErrorInfo &error) {
         // Throwing from here would complicate the API, so let's report the error the same way
         // as all others, via AbstractJob::error().