diff --git a/src/libs/timeline/timelineitemsrenderpass.cpp b/src/libs/timeline/timelineitemsrenderpass.cpp
index b35497047a9..32a9af32360 100644
--- a/src/libs/timeline/timelineitemsrenderpass.cpp
+++ b/src/libs/timeline/timelineitemsrenderpass.cpp
@@ -144,8 +144,12 @@ float OpaqueColoredPoint2DWithSize::top() const
 
 void OpaqueColoredPoint2DWithSize::update(float nr, float ny)
 {
-    if (a <= MaximumDirection)
+    if (a <= MaximumDirection) {
         a += MaximumDirection;
+        id = -2;
+    } else {
+        --id;
+    }
 
     y += ny;
     w = nr - x;
diff --git a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
index 58f59218fb7..77eccac70d1 100644
--- a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
+++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
@@ -302,7 +302,7 @@ QString CompletionChunksToTextConverter::inDesiredTextFormat(const Utf8String &t
 bool CompletionChunksToTextConverter::emphasizeCurrentPlaceHolder() const
 {
     if (m_addPlaceHolderPositions) {
-        const uint currentPlaceHolderPosition = m_placeholderPositions.size() + 1;
+        const uint currentPlaceHolderPosition = uint(m_placeholderPositions.size() + 1);
         return uint(m_placeHolderPositionToEmphasize) == currentPlaceHolderPosition;
     }
 
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index afc1260ec3f..2e4ab20270f 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -546,8 +546,6 @@ void QbsProject::changeActiveTarget(Target *t)
     BuildConfiguration *bc = 0;
     if (t) {
         m_qbsProject = m_qbsProjects.value(t);
-        if (m_qbsProject.isValid())
-            m_projectData = m_qbsProject.projectData();
         if (t->kit())
             bc = t->activeBuildConfiguration();
     }