Merge remote-tracking branch 'origin/4.8'

 Conflicts:
	tests/unit/unittest/unittest.pro

Change-Id: I4f0ab05f96ee60900a3a35fad4c7331238367593

1 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/debugger/enginemanager.cpp b/src/plugins/debugger/enginemanager.cpp
index 8e829c7cfb0..9ac2e31b11e 100644
--- a/src/plugins/debugger/enginemanager.cpp
+++ b/src/plugins/debugger/enginemanager.cpp
@@ -133,7 +133,10 @@ public:
     EngineManagerPrivate()
     {
         m_engineModel.setHeader({EngineManager::tr("Name"), EngineManager::tr("File")});
-        m_engineModel.rootItem()->appendChild(new EngineItem); // The preset case.
+        // The preset case:
+        auto preset = new EngineItem;
+        m_engineModel.rootItem()->appendChild(preset);
+        m_currentItem = preset;
 
         m_engineChooser = new QComboBox;
         m_engineChooser->setModel(&m_engineModel);