[BUGFIX] Fixed backward compat. with older Qt5 versions

hasherezade · Sep 15, 2024 · f388aa8 · f388aa8
1 parent 14d6f20
commit f388aa8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/pe-bear/QtCompat.h b/pe-bear/QtCompat.h
@@ -4,10 +4,14 @@
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 	#include <QtWidgets>
-	#define QT_SkipEmptyParts Qt::SkipEmptyParts
 #else
 	#include <QtGui>
-	typedef QRegExp QRegularExpression;
-	typedef QRegExpValidator QRegularExpressionValidator;
-	#define QT_SkipEmptyParts QString::SkipEmptyParts
+        typedef QRegExp QRegularExpression;
+        typedef QRegExpValidator QRegularExpressionValidator;
+#endif
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+        #define QT_SkipEmptyParts Qt::SkipEmptyParts
+#else
+        #define QT_SkipEmptyParts QString::SkipEmptyParts
 #endif
diff --git a/pe-bear/gui/windows/SignaturesBrowseWindow.h b/pe-bear/gui/windows/SignaturesBrowseWindow.h
@@ -74,7 +74,7 @@ class SigSortFilterProxyModel : public QSortFilterProxyModel
 		for(int i = 0; i < source->columnCount(); i++)
 		{
 			QModelIndex index = source->index(sourceRow, i, sourceParent);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
 			if (source->data(index).toString().toLower().trimmed().contains(filterRegularExpression())) return true;
 #else
 			if (source->data(index).toString().toLower().trimmed().contains(filterRegExp())) return true;

diff --git a/pe-bear/gui/windows/StringsBrowseWindow.cpp b/pe-bear/gui/windows/StringsBrowseWindow.cpp
@@ -97,7 +97,7 @@ void StringsBrowseWindow::filterPatamsChanged(QString &str, bool isRegex, bool i
 	if (!this->stringsProxyModel) return;
 
 	if (isRegex) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
 		QRegularExpression::PatternOptions options = isCaseSens ?
 			QRegularExpression::NoPatternOption :
 			QRegularExpression::CaseInsensitiveOption;