diff options
Diffstat (limited to 'qmake/generators/win32/msbuild_objectmodel.cpp')
-rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 355260c974..82c0983272 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -34,7 +34,7 @@ #include <qscopedpointer.h> #include <qstringlist.h> #include <qfileinfo.h> -#include <qregexp.h> +#include <qregularexpression.h> QT_BEGIN_NAMESPACE @@ -834,12 +834,13 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) QFile manifestFile(Option::output_dir + QLatin1Char('/') + manifest); if (manifestFile.open(QFile::ReadOnly)) { const QString contents = manifestFile.readAll(); - QRegExp regexp("[\\\\/a-zA-Z0-9_\\-\\!]*\\.(png|jpg|jpeg)"); + QRegularExpression regexp("[\\\\/a-zA-Z0-9_\\-\\!]*\\.(png|jpg|jpeg)"); int pos = 0; while (pos > -1) { - pos = regexp.indexIn(contents, pos); + QRegularExpressionMatch m; + pos = contents.indexOf(regexp, pos, &m); if (pos >= 0) { - const QString match = regexp.cap(0); + const QString match = m.captured(0); icons.insert(match); pos += match.length(); } |