Merge remote-tracking branch 'origin/4.10' into 4.11

 Conflicts:
	src/datasources/servicesource.cpp
	src/datasources/servicesource.h

Change-Id: I4c2b815f3a4963d32d9ee4f053b727ce6df710c6

1 files changed, 9 insertions, 0 deletions

diff --git a/src/usagestatisticplugin.cpp b/src/usagestatisticplugin.cpp
index df09d74..5f04486 100644
--- a/src/usagestatisticplugin.cpp
+++ b/src/usagestatisticplugin.cpp
@@ -53,6 +53,7 @@
 #include "datasources/examplesdatasource.h"
 #include "datasources/kitsource.h"
 #include "datasources/qmldesignerusagetimesource.h"
+#include "datasources/servicesource.h"
 
 #include "services/datasubmitter.h"
 
@@ -110,6 +111,13 @@ static void addQtCreatorDataSources(KUserFeedback::Provider &provider)
     provider.addDataSource(new QmlDesignerUsageTimeSource);
 }
 
+static void addServiceDataSource(const std::shared_ptr<KUserFeedback::Provider> &provider)
+{
+    if (provider) {
+        provider->addDataSource(new ServiceSource(provider));
+    }
+}
+
 bool UsageStatisticPlugin::delayedInitialize()
 {
     // We should create the provider only after everything else
@@ -118,6 +126,7 @@ bool UsageStatisticPlugin::delayedInitialize()
 
     addDefaultDataSources(*m_provider);
     addQtCreatorDataSources(*m_provider);
+    addServiceDataSource(m_provider);
 
     createUsageStatisticPage();