From 5e7720d3fba1865439bf21fd564152b8b9a70f13 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Fri, 22 Jul 2016 09:25:06 +0200
Subject: qmlplugindump: fix regexp for plugins.qmltypes

The latest plugins.qmltypes files contain whitespace after
"dependencies:". Furthermore, just for the sake of correctness,
escape dots in the QtQuick.tooling module import URI and version.

Change-Id: I54fa288bc530f7852747c75b4d656e789d519cf2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
---
 tools/qmlplugindump/qmltypereader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/qmlplugindump/qmltypereader.cpp')

diff --git a/tools/qmlplugindump/qmltypereader.cpp b/tools/qmlplugindump/qmltypereader.cpp
index 67ba415388..9dfb6fc1e0 100644
--- a/tools/qmlplugindump/qmltypereader.cpp
+++ b/tools/qmlplugindump/qmltypereader.cpp
@@ -40,7 +40,7 @@
 #include <iostream>
 
 QStringList readQmlTypes(const QString &filename) {
-    QRegularExpression re("import QtQuick.tooling 1.2.*Module {\\s*dependencies:\\[([^\\]]*)\\](.*)}",
+    QRegularExpression re("import QtQuick\\.tooling 1\\.2.*Module {\\s*dependencies:\\s*\\[([^\\]]*)\\](.*)}",
                           QRegularExpression::DotMatchesEverythingOption);
     if (!QFileInfo(filename).exists()) {
         std::cerr << "Non existing file: " << filename.toStdString() << std::endl;
-- 
cgit v1.2.3