diff options
author | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:46:20 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:51:11 +0100 |
commit | c577f6edafef7c40a5f78092ec4fcd78bb820b2c (patch) | |
tree | 9ca3819e5cca9b7e61f305a874b682e5a2085e83 /examples/widgets/painting | |
parent | 99ce1d3d97c0423c3ee63ccf58deed964db0770e (diff) | |
parent | de225ccdf95efb57866d62bc80872c1a2ab99703 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/corelib/plugin/qlibrary_unix.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
Change-Id: I632c400d909f8c204f55743aadc7886af2f15dfb
Diffstat (limited to 'examples/widgets/painting')
-rw-r--r-- | examples/widgets/painting/shared/arthurwidgets.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/examples/widgets/painting/shared/arthurwidgets.cpp b/examples/widgets/painting/shared/arthurwidgets.cpp index ffed01a3f3..965660a3a3 100644 --- a/examples/widgets/painting/shared/arthurwidgets.cpp +++ b/examples/widgets/painting/shared/arthurwidgets.cpp @@ -59,6 +59,7 @@ #include <QFile> #include <QTextBrowser> #include <QBoxLayout> +#include <QRegularExpression> extern QPixmap cached(const QString &img); @@ -339,14 +340,12 @@ void ArthurFrame::showSource() foreach (QString keyword, ppKeywords) contents.replace(keyword, QLatin1String("<font color=navy>") + keyword + QLatin1String("</font>")); - contents.replace(QRegExp("(\\d\\d?)"), QLatin1String("<font color=navy>\\1</font>")); + contents.replace(QRegularExpression("(\\d\\d?)"), QLatin1String("<font color=navy>\\1</font>")); - QRegExp commentRe("(//.+)\\n"); - commentRe.setMinimal(true); + QRegularExpression commentRe("(//.+?)\\n"); contents.replace(commentRe, QLatin1String("<font color=red>\\1</font>\n")); - QRegExp stringLiteralRe("(\".+\")"); - stringLiteralRe.setMinimal(true); + QRegularExpression stringLiteralRe("(\".+?\")"); contents.replace(stringLiteralRe, QLatin1String("<font color=green>\\1</font>")); QString html = contents; |