diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-08-01 16:27:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-02 01:47:33 +0200 |
| commit | 0412055322cf44c1127246ff817ab7a75b735680 (patch) | |
| tree | ece7a2e46a5292a6ec3aaa44dc443770d37e14c5 /tools | |
| parent | 18c11ce3405526a6e16b28395dd1b9eb6659ba40 (diff) | |
Don't enable qmlscene compability mode for commented out imports.
Valid import statements should be at the start of a line, maybe
preceded by some white space.
Task-number: QTBUG-20649
Change-Id: I1944bce0d30e680ebdb0798f5ae4e8c91a057a13
Reviewed-on: http://codereview.qt.nokia.com/2423
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlscene/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 1d3641b61e..0d6f813a8e 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -358,8 +358,8 @@ static void checkAndAdaptVersion(const QUrl &url) return; } - QRegExp quick1("import +QtQuick +1\\."); - QRegExp qt47("import +Qt +4\\.7"); + QRegExp quick1("^\\s*import +QtQuick +1\\."); + QRegExp qt47("^\\s*import +Qt +4\\.7"); QString envToWrite; QString compat; |