Merge remote-tracking branch 'origin/2.3'

Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472

3 files changed, 12 insertions, 3 deletions

diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.cpp b/src/plugins/qtsupport/debugginghelperbuildtask.cpp
index 9330442ad9..7cdf0dfae6 100644
--- a/src/plugins/qtsupport/debugginghelperbuildtask.cpp
+++ b/src/plugins/qtsupport/debugginghelperbuildtask.cpp
@@ -166,8 +166,8 @@ void DebuggingHelperBuildTask::run(QFutureInterface<void> &future)
         log(result, QString());
     }
 
-    emit updateQtVersions(m_qmakeCommand);
     emit finished(m_qtId, m_log, m_tools);
+    emit updateQtVersions(m_qmakeCommand);
     deleteLater();
 }
 
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
index 8c032d6ba5..3d60f135bd 100644
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -89,7 +89,7 @@ QList<ExampleItem> ExamplesListModel::parseExamples(QXmlStreamReader* reader, co
                 item.hasSourceCode = !item.projectPath.isEmpty();
                 item.projectPath.prepend('/');
                 item.projectPath.prepend(projectsOffset);
-                item.imageUrl = attributes.value(QLatin1String("imagePath")).toString();
+                item.imageUrl = attributes.value(QLatin1String("imageUrl")).toString();
                 item.docUrl = attributes.value(QLatin1String("docUrl")).toString();
             } else if (reader->name() == QLatin1String("fileToOpen")) {
                 item.filesToOpen.append(projectsOffset + '/' + reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
@@ -250,7 +250,14 @@ QStringList ExamplesListModel::exampleSources() const
     QFileInfoList sources;
     const QStringList pattern(QLatin1String("*.xml"));
 
-    // TODO: Read key from settings
+    // Read keys from SDK installer
+    QSettings *settings = Core::ICore::instance()->settings(QSettings::SystemScope);
+    int size = settings->beginReadArray("ExampleManifests");
+    for (int i = 0; i < size; ++i) {
+        settings->setArrayIndex(i);
+        sources.append(settings->value("Location").toString());
+    }
+    settings->endArray();
 
     if (sources.isEmpty()) {
         // Try to get dir from first Qt Version
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index f8e829a2e0..3781467dc6 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -293,6 +293,8 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, const QS
 
     if (!success)
         showDebuggingBuildLog(item);
+
+    updateDebuggingHelperUi();
 }
 
 void QtOptionsPageWidget::cleanUpQtVersions()