Merge remote-tracking branch 'origin/5.6' into dev

* origin/5.6:
  Fixed demo excludelist handling
  Open close button also by tapping
  center text
  new settings icon which does not look disabled
  make path flickable with all screen height
  Use one unified xml to read metadatas for demos.

Conflicts:
	src/applicationsmodel.cpp

Change-Id: I72f59a135f39595e9dc02586694bf51dabf95048

1 files changed, 1 insertions, 1 deletions

diff --git a/src/applicationsmodel.cpp b/src/applicationsmodel.cpp
index 7c51223..2638ac9 100644
--- a/src/applicationsmodel.cpp
+++ b/src/applicationsmodel.cpp
@@ -78,7 +78,7 @@ public:
                     case QXmlStreamReader::StartElement:
                         if (xml.name().toString().toLower() == "application") {
 
-                            const QStringList excludeList = xml.attributes().value("exclude").toString().split(QRegExp(":|\\s+"));
+                            const QStringList excludeList = xml.attributes().value("exclude").toString().split(QStringLiteral(";"));
 
                             exclude = excludeList.contains(target) || excludeList.contains(QStringLiteral("all"));