1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows QPA: Fix regular expression to match CLSIDs in file dialog.

Browse Source 
Match correct number of digits and entire string, amending
change 4347e811611ab15e544765a3a34761d2f5c68cb3.

Task-number: QTBUG-33962
Task-number: QTBUG-51373
Change-Id: I56de00bd5ffb3a3a700efbb20970154faf86f923
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Friedemann Kleint 2016-03-23 13:05:54 +01:00
parent 1534297323
commit 2e385b3d74
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
View File

@ -1325,7 +1325,7 @@ void QWindowsNativeFileDialogBase::setLabelText(QFileDialogOptions::DialogLabel
static inline bool isClsid(const QString &s) static inline bool isClsid(const QString &s)
{ {
// detect "374DE290-123F-4565-9164-39C4925E467B". // detect "374DE290-123F-4565-9164-39C4925E467B".
static const QRegularExpression pattern(QLatin1String("[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{8}")); static const QRegularExpression pattern(QLatin1String("\\A[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\\z"));
Q_ASSERT(pattern.isValid()); Q_ASSERT(pattern.isValid());
return pattern.match(s).hasMatch(); return pattern.match(s).hasMatch();
} }