diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 85bef4df1d4..97d2297d163 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -102,7 +102,8 @@ QbsProject::QbsProject(QbsManager *manager, const QString &fileName) :
     m_qbsUpdateFutureInterface(0),
     m_parsingScheduled(false),
     m_cancelStatus(CancelStatusNone),
-    m_currentBc(0)
+    m_currentBc(0),
+    m_extraCompilersPending(false)
 {
     m_parsingDelay.setInterval(1000); // delay parsing by 1s.
 
@@ -575,6 +576,10 @@ void QbsProject::updateAfterBuild()
     m_projectData = m_qbsProject.projectData();
     updateBuildTargetData();
     updateCppCompilerCallData();
+    if (m_extraCompilersPending) {
+        m_extraCompilersPending = false;
+        updateCppCodeModel();
+    }
 }
 
 void QbsProject::registerQbsProjectParser(QbsProjectParser *p)
@@ -798,8 +803,11 @@ void QbsProject::updateCppCodeModel()
                             continue;
                         QStringList generated = m_qbsProject.generatedFiles(prd, source.filePath(),
                                                                             false);
-                        if (generated.isEmpty())
+                        if (generated.isEmpty()) {
+                            // We don't know the target files until we build for the first time.
+                            m_extraCompilersPending = true;
                             continue;
+                        }
 
                         const FileNameList fileNames = Utils::transform(generated,
                                                                         [](const QString &s) {
diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h
index 72c3e7502e3..5ad9ecff053 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.h
+++ b/src/plugins/qbsprojectmanager/qbsproject.h
@@ -166,6 +166,7 @@ private:
 
     QTimer m_parsingDelay;
     QList<ProjectExplorer::ExtraCompiler *> m_extraCompilers;
+    bool m_extraCompilersPending;
 };
 
 } // namespace Internal