danmar · danmar · Mar 22, 2022 · Mar 21, 2022 · Mar 21, 2022 · Mar 22, 2022
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
@@ -27,6 +27,7 @@
 #include <QDir>
 #include <QFile>
 #include <QProcess>
+#include <QRegExp>
 #include <QSettings>
 
 static bool executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string *output)

diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts
diff --git a/gui/cppcheck_es.ts b/gui/cppcheck_es.ts
diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts
diff --git a/gui/cppcheck_fr.ts b/gui/cppcheck_fr.ts
diff --git a/gui/cppcheck_it.ts b/gui/cppcheck_it.ts
diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts
diff --git a/gui/cppcheck_ko.ts b/gui/cppcheck_ko.ts
diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts
diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts
diff --git a/gui/cppcheck_sr.ts b/gui/cppcheck_sr.ts
diff --git a/gui/cppcheck_sv.ts b/gui/cppcheck_sv.ts
diff --git a/gui/cppcheck_zh_CN.ts b/gui/cppcheck_zh_CN.ts
diff --git a/gui/librarydialog.cpp b/gui/librarydialog.cpp
@@ -28,6 +28,7 @@
 #include <QFile>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QRegExp>
 #include <QTextStream>
 
 // TODO: get/compare functions from header

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -51,6 +51,7 @@
 #include <QFileInfo>
 #include <QInputDialog>
 #include <QMessageBox>
+#include <QRegExp>
 #include <QSettings>
 #include <QTimer>
 
@@ -594,7 +595,7 @@ QStringList MainWindow::selectFilesToAnalyze(QFileDialog::FileMode mode)
             mCurrentDirectory = inf.absolutePath();
         }
         formatAndSetTitle();
-    } else if (mode == QFileDialog::DirectoryOnly) {
+    } else if (mode == QFileDialog::Directory) {
         QString dir = QFileDialog::getExistingDirectory(this,
                                                         tr("Select directory to analyze"),
                                                         getPath(SETTINGS_LAST_CHECK_PATH));
@@ -678,7 +679,7 @@ void MainWindow::analyzeFiles()
 
 void MainWindow::analyzeDirectory()
 {
-    QStringList dir = selectFilesToAnalyze(QFileDialog::DirectoryOnly);
+    QStringList dir = selectFilesToAnalyze(QFileDialog::Directory);
     if (dir.isEmpty())
         return;
 

diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
@@ -31,6 +31,7 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QRegExp>
 #include <QSettings>
 
 /** Return paths from QListWidget */

diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
@@ -1260,7 +1260,7 @@ void ResultsTree::updateFromOldReport(const QString &filename)
                 error->setData(data);
                 fileItem->child(j, COLUMN_SINCE_DATE)->setText(oldErrors[oldErrorIndex].sinceDate);
             } else if (oldErrorIndex < 0 || data[SINCEDATE].toString().isEmpty()) {
-                const QString sinceDate = QDate::currentDate().toString(Qt::SystemLocaleShortDate);
+                const QString sinceDate = QLocale::system().dateFormat(QLocale::ShortFormat);
                 data[SINCEDATE] = sinceDate;
                 error->setData(data);
                 fileItem->child(j, COLUMN_SINCE_DATE)->setText(sinceDate);

diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
@@ -555,11 +555,19 @@ void ResultsView::variableDoubleClicked(QListWidgetItem* item)
 
 void ResultsView::editVariablesFilter(const QString &text)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+    for (auto *item: mUI->mListAddedVariables->findItems(".*", Qt::MatchRegularExpression)) {
+#else
     for (auto *item: mUI->mListAddedVariables->findItems(".*", Qt::MatchRegExp)) {
+#endif
         QString varname = item->text().mid(0, item->text().indexOf(" "));
         item->setHidden(!varname.contains(text));
     }
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+    for (auto *item: mUI->mListMissingVariables->findItems(".*", Qt::MatchRegularExpression))
+#else
     for (auto *item: mUI->mListMissingVariables->findItems(".*", Qt::MatchRegExp))
+#endif
         item->setHidden(!item->text().contains(text));
 }
 

diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp
@@ -30,6 +30,7 @@
 #include <QFileInfo>
 #include <QMimeData>
 #include <QPrinter>
+#include <QRegExp>
 #include <QTextDocument>
 #include <QWidget>