Use a common way to check for Qt6 instead of introducing UB

DarthGandalf · CalcProgrammer1 · commit b2ea4212fd86 · 2025-01-05T22:46:12.000Z
diff --git a/OpenRGB.pro b/OpenRGB.pro
@@ -21,8 +21,6 @@ CONFIG +=   c++17
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-greaterThan(QT_MAJOR_VERSION, 5): DEFINES += _QT6
-
 #-----------------------------------------------------------------------------------------------#
 # Application Configuration                                                                     #
 #-----------------------------------------------------------------------------------------------#
diff --git a/qt/OpenRGBSupportedDevicesPage/OpenRGBSupportedDevicesPage.cpp b/qt/OpenRGBSupportedDevicesPage/OpenRGBSupportedDevicesPage.cpp
@@ -70,7 +70,7 @@ void OpenRGBSupportedDevicesPage::on_GetHardwareIDsButton_clicked()
 
 void OpenRGBSupportedDevicesPage::on_Filter_textChanged(const QString &arg1)
 {
-#ifdef _QT6
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     detectorSortModel->setFilterRegularExpression(QRegularExpression(arg1 , QRegularExpression::CaseInsensitiveOption));
 #else
     detectorSortModel->setFilterRegExp(QRegExp(arg1, Qt::CaseInsensitive));

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void OpenRGBSupportedDevicesPage::on_GetHardwareIDsButton_clicked()`
`70`	`70`
`71`	`71`	`void OpenRGBSupportedDevicesPage::on_Filter_textChanged(const QString &arg1)`
`72`	`72`	`{`
`73`		`-#ifdef _QT6`
	`73`	`+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))`
`74`	`74`	`detectorSortModel->setFilterRegularExpression(QRegularExpression(arg1 , QRegularExpression::CaseInsensitiveOption));`
`75`	`75`	`#else`
`76`	`76`	`detectorSortModel->setFilterRegExp(QRegExp(arg1, Qt::CaseInsensitive));`