diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-22 09:25:06 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 15:03:39 +0000 |
| commit | 5e7720d3fba1865439bf21fd564152b8b9a70f13 (patch) | |
| tree | 80488772cf739948967bd03906ba735c7fe2de51 /tools | |
| parent | 4493524ec24afb946eba3942f48d9fc1ff3192c1 (diff) | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/qmltypereader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |