summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-04-03 20:58:47 +0200
committerLars Knoll <lars.knoll@qt.io>2020-05-06 09:58:24 +0200
commit2a7c30e508d150dc26de170b9cbb55aa5a72449b (patch)
treefc013104767bf319688438605a184d9165006c48 /src
parentadf829e65d0837c043dbfdfaba49dd145debe954 (diff)
Remove some leftover includes of QRegExp
and include qrefularexpression.h in the pch for Qt Core. Change-Id: Ibfa84c911dfcffd3e5a5cf11e48b186cff6e7d7a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qt_pch.h2
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h
index 0dfd6c745f..0d5c08e41a 100644
--- a/src/corelib/global/qt_pch.h
+++ b/src/corelib/global/qt_pch.h
@@ -69,7 +69,7 @@
#include <qlist.h>
#include <qvariant.h> /* All moc genereated code has this include */
#include <qobject.h>
-#include <qregexp.h>
+#include <qregularexpression.h>
#include <qscopedpointer.h>
#include <qshareddata.h>
#include <qstring.h>
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index 3bc3b546da..fac7058d29 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -45,7 +45,6 @@
#include <qmimedata.h>
#include <qdebug.h>
#include <qvector.h>
-#include <qregexp.h>
#if QT_CONFIG(regularexpression)
# include <qregularexpression.h>
#endif