diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2018-06-30 13:56:14 +0200 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@edeltech.ch> | 2018-07-02 22:27:06 +0000 |
| commit | 179a8662f60bf86dc0734af192bfe41e332a5292 (patch) | |
| tree | cc5b42b40832358e01f5c4eca51c5ae5fa23786a | |
| parent | 81f4714c265de70c6085c0823251e54ae7f4881a (diff) | |
Migrate QAxWidget to QRegularExpresssion
This patch updates the QAxWidget class to use QRegularExpression in
place of QRegExp which is to be considered deprecated.
Change-Id: If11f23f2492012cb69726e54f80801fd9481a066
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index 5039123..07315cf 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -65,7 +65,7 @@ #include <qmetaobject.h> #include <qpainter.h> #include <qpointer.h> -#include <qregexp.h> +#include <qregularexpression.h> #include <quuid.h> #include <qwhatsthis.h> #include <qabstractnativeeventfilter.h> @@ -1259,7 +1259,7 @@ QMenu *QAxClientSite::generatePopup(HMENU subMenu, QWidget *parent) popupMenu = item.hSubMenu ? generatePopup(item.hSubMenu, popup) : 0; int res = menuItemEntry(subMenu, i, item, text, icon); - int lastSep = text.lastIndexOf(QRegExp(QLatin1String("[\\s]"))); + int lastSep = text.lastIndexOf(QRegularExpression(QLatin1String("[\\s]"))); if (lastSep != -1) { QString keyString = text.right(text.length() - lastSep); accel = keyString; |