Bump Qt to 6.10.2 (#265)

jkennedyvz · web-flow · commit fe1daf7961a3 · 2026-02-11T10:21:25.000-08:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ on:
 permissions:
   contents: read
 env:
-    QT_VERSION: 6.9.2
+    QT_VERSION: 6.10.2
 jobs:
   # This is a super hacky way to get this into a place that can actually be
   # used by downstream jobs because YAML values don't allow shell
@@ -149,7 +149,7 @@ jobs:
             chmod a+x linuxdeploy*.AppImage
             export VERSION=${{ env.githash }}
             export PATH=$PATH:/opt/Qt/${{env.QT_VERSION}}/gcc_64/libexec
-            export LINUXDEPLOY_EXCLUDED_LIBRARIES=libqsqlmimer.so
+            export LINUXDEPLOY_EXCLUDED_LIBRARIES="libqsqlmimer.so;libqsqloci.so"
             ./linuxdeploy-x86_64.AppImage --appdir=appdir  --output appimage \
                 -e src/ashirt \
                 -d ../deploy/ashirt.desktop \
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,7 +58,7 @@ else()
 endif()
      message(STATUS "VERSION: ${CMAKE_PROJECT_VERSION}")
 
-find_package(Qt6 6.5.0 REQUIRED COMPONENTS
+find_package(Qt6 6.10.0 REQUIRED COMPONENTS
     Widgets
     Gui
     Network
diff --git a/Readme_Developer.md b/Readme_Developer.md
@@ -2,9 +2,9 @@
 
 ## Building and Build Requirements
 
-This application is built off of Qt 6.5+, and utilizes's Qt's networking and Sql featuresets. To build, your specific system may need the following:
+This application is built off of Qt 6.10+, and utilizes's Qt's networking and Sql featuresets. To build, your specific system may need the following:
 
-1. Qt 6.5+, `cmake`, and possibly Qt Creator IDE.
+1. Qt 6.10+, `cmake`, and possibly Qt Creator IDE.
    1. Binaries located [here](https://www.qt.io/download-qt-installer?hsCtaTracking=99d9dd4f-5681-48d2-b096-470725510d34%7C074ddad0-fdef-4e53-8aa8-5e8a876d6ab4). You may need to alter which downloader you install.
 2. SQLite C driver (for SQLite version 3)
    1. On Fedora, this can be installed with `yum install sqlite-devel`
diff --git a/src/components/flow_layout/flowlayout.cpp b/src/components/flow_layout/flowlayout.cpp
@@ -113,7 +113,7 @@ QSize FlowLayout::sizeHint() const {
 
 QSize FlowLayout::minimumSize() const {
   QSize size;
-  for (const QLayoutItem *item : qAsConst(itemList))
+  for (const QLayoutItem *item : std::as_const(itemList))
     size = size.expandedTo(item->minimumSize());
 
   const QMargins margins = contentsMargins();
@@ -122,14 +122,13 @@ QSize FlowLayout::minimumSize() const {
 }
 
 int FlowLayout::doLayout(const QRect &rect, bool testOnly) const {
-  int left, top, right, bottom;
-  getContentsMargins(&left, &top, &right, &bottom);
-  QRect effectiveRect = rect.adjusted(+left, +top, -right, -bottom);
+  const QMargins m = contentsMargins();
+  QRect effectiveRect = rect.adjusted(+m.left(), +m.top(), -m.right(), -m.bottom());
   int x = effectiveRect.x();
   int y = effectiveRect.y();
   int lineHeight = 0;
 
-  for (QLayoutItem *item : qAsConst(itemList)) {
+  for (QLayoutItem *item : std::as_const(itemList)) {
     const QWidget *wid = item->widget();
     int spaceX = horizontalSpacing();
     if (spaceX == -1) {
@@ -157,7 +156,7 @@ int FlowLayout::doLayout(const QRect &rect, bool testOnly) const {
     x = nextX;
     lineHeight = qMax(lineHeight, item->sizeHint().height());
   }
-  return y + lineHeight - rect.y() + bottom;
+  return y + lineHeight - rect.y() + m.bottom();
 }
 
 int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const {
diff --git a/src/components/tagging/tag_cache/tagcache.cpp b/src/components/tagging/tag_cache/tagcache.cpp
@@ -11,7 +11,7 @@ TagCache::TagCache(QObject *parent): QObject(parent) {
 }
 
 TagCache::~TagCache() {
-  for (auto entry : qAsConst(tagRequests)) {
+  for (auto entry : std::as_const(tagRequests)) {
     cleanUpReply(&(entry));
   }
 }
diff --git a/src/db/databaseconnection.cpp b/src/db/databaseconnection.cpp
@@ -1,6 +1,7 @@
 #include "databaseconnection.h"
 
 #include <QDir>
+#include <QTimeZone>
 #include <QVariant>
 
 #include "helpers/file_helpers.h"
@@ -24,7 +25,7 @@ bool DatabaseConnection::withConnection(const QString& dbPath, const QString &db
         return false;
     actions(conn);
     bool rtn = true;
-    if( conn._db.lastError().type() != QSqlError::NoError)
+    if(conn._db.lastError().isValid())
         rtn = false;
 
     conn.close();
@@ -75,7 +76,7 @@ model::Evidence DatabaseConnection::getEvidenceDetails(qint64 evidenceID)
   model::Evidence rtn;
   auto qStr = QStringLiteral("%1 WHERE id=? LIMIT 1").arg(_sqlSelectTemplate.arg(_evidenceAllKeys, _tblEvidence));
   auto query = executeQuery(_db, qStr, {evidenceID});
-  if (_db.lastError().type() == QSqlError::NoError && query.first()) {
+  if (!_db.lastError().isValid() && query.first()) {
     rtn.id = query.value(QStringLiteral("id")).toLongLong();
     rtn.path = query.value(QStringLiteral("path")).toString();
     rtn.operationSlug = query.value(QStringLiteral("operation_slug")).toString();
@@ -84,8 +85,8 @@ model::Evidence DatabaseConnection::getEvidenceDetails(qint64 evidenceID)
     rtn.errorText = query.value(QStringLiteral("error")).toString();
     rtn.recordedDate = query.value(QStringLiteral("recorded_date")).toDateTime();
     rtn.uploadDate = query.value(QStringLiteral("upload_date")).toDateTime();
-    rtn.recordedDate.setTimeSpec(Qt::UTC);
-    rtn.uploadDate.setTimeSpec(Qt::UTC);
+    rtn.recordedDate.setTimeZone(QTimeZone::UTC);
+    rtn.uploadDate.setTimeZone(QTimeZone::UTC);
     rtn.tags = getTagsForEvidenceID(evidenceID);
   } else {
     rtn.id = -1;
@@ -96,18 +97,18 @@ model::Evidence DatabaseConnection::getEvidenceDetails(qint64 evidenceID)
 bool DatabaseConnection::updateEvidenceDescription(const QString &newDescription, qint64 evidenceID)
 {
     auto q = executeQuery(_db, QStringLiteral("UPDATE evidence SET description=? WHERE id=?"), {newDescription, evidenceID});
-    return (q.lastError().type() == QSqlError::NoError);
+    return !q.lastError().isValid();
 }
 
 bool DatabaseConnection::deleteEvidence(qint64 evidenceID)
 {
     auto q = executeQuery(_db, QStringLiteral("DELETE FROM evidence WHERE id=?"), {evidenceID});
-    return (q.lastError().type() == QSqlError::NoError);
+    return !q.lastError().isValid();
 }
 
 bool DatabaseConnection::updateEvidenceError(const QString &errorText, qint64 evidenceID) {
   auto q = executeQuery(_db, QStringLiteral("UPDATE evidence SET error=? WHERE id=?"), {errorText, evidenceID});
-  return (q.lastError().type() == QSqlError::NoError);
+  return !q.lastError().isValid();
 }
 
 void DatabaseConnection::updateEvidenceSubmitted(qint64 evidenceID) {
@@ -157,12 +158,12 @@ bool DatabaseConnection::setEvidenceTags(const QList<model::Tag> &newTags, qint6
 
   auto qDelStr = QStringLiteral("DELETE FROM tags WHERE tag_id NOT IN (?) AND evidence_id = ?");
   auto a = executeQuery(_db, qDelStr, {newTagIds, evidenceID});
-  if(a.lastError().type() != QSqlError::NoError)
+  if(a.lastError().isValid())
       return false;
 
   auto qSelStr = QStringLiteral("SELECT tag_id FROM tags WHERE evidence_id = ?");
   auto currentTagsResult = executeQuery(_db, qSelStr, {evidenceID});
-  if (currentTagsResult.lastError().type() != QSqlError::NoError)
+  if (currentTagsResult.lastError().isValid())
       return false;
 
   QList<qint64> currentTags;
@@ -199,7 +200,7 @@ bool DatabaseConnection::setEvidenceTags(const QList<model::Tag> &newTags, qint6
       args.append(item.name);
     }
     auto q = executeQuery(_db, baseQuery, args);
-    if (q.lastError().type() != QSqlError::NoError)
+    if (q.lastError().isValid())
         return false;
   }
   return true;
@@ -282,8 +283,8 @@ QList<model::Evidence> DatabaseConnection::getEvidenceWithFilters(const Evidence
         evi.errorText = resultSet.value(QStringLiteral("error")).toString();
         evi.recordedDate = resultSet.value(QStringLiteral("recorded_date")).toDateTime();
         evi.uploadDate = resultSet.value(QStringLiteral("upload_date")).toDateTime();
-        evi.recordedDate.setTimeSpec(Qt::UTC);
-        evi.uploadDate.setTimeSpec(Qt::UTC);
+        evi.recordedDate.setTimeZone(QTimeZone::UTC);
+        evi.uploadDate.setTimeZone(QTimeZone::UTC);
         allEvidence.append(evi);
     }
 
@@ -401,7 +402,7 @@ QueryResult DatabaseConnection::executeQueryNoThrow(const QSqlDatabase& db, cons
 qint64 DatabaseConnection::doInsert(const QSqlDatabase& db, const QString &stmt, const QVariantList &args)
 {
   auto query = executeQuery(db, stmt, args);
-  if(query.lastInsertId() != QVariant())
+  if(query.lastInsertId().isValid())
     return query.lastInsertId().toLongLong();
   return -1;
 }
diff --git a/src/db/query_result.h b/src/db/query_result.h
@@ -15,7 +15,7 @@ class QueryResult {
   QueryResult(QSqlQuery query) {
     this->err = query.lastError();
     this->query = std::move(query);
-    this->success = err.type() == QSqlError::NoError;
+    this->success = !err.isValid();
   }
 
  public:
diff --git a/src/forms/evidence/evidencemanager.cpp b/src/forms/evidence/evidencemanager.cpp
@@ -335,7 +335,7 @@ void EvidenceManager::loadEvidence()
 
     auto filter = EvidenceFilters::parseFilter(filterTextBox->text());
     QList<model::Evidence> operationEvidence = db->getEvidenceWithFilters(filter);
-    if(db->lastError().type() != QSqlError::NoError){
+    if(db->lastError().isValid()){
         qWarning() << "Could not retrieve evidence for operation. Error: " << db->lastError().text();
     }
     evidenceTable->setRowCount(operationEvidence.size());
diff --git a/src/forms/evidence_filter/evidencefilterform.cpp b/src/forms/evidence_filter/evidencefilterform.cpp
@@ -123,8 +123,12 @@ void EvidenceFilterForm::wireUi() {
   connect(NetMan::get(), &NetMan::operationListUpdated, this, &EvidenceFilterForm::onOperationListUpdated);
   connect(buttonBox, &QDialogButtonBox::accepted, this, &EvidenceFilterForm::writeAndClose);
 
-  connect(includeStartDateCheckBox, &QCheckBox::stateChanged, fromDateEdit, &QDateEdit::setEnabled);
-  connect(includeEndDateCheckBox, &QCheckBox::stateChanged, toDateEdit, &QDateEdit::setEnabled);
+  connect(includeStartDateCheckBox, &QCheckBox::checkStateChanged, this, [this](Qt::CheckState state) {
+    fromDateEdit->setEnabled(state == Qt::Checked);
+  });
+  connect(includeEndDateCheckBox, &QCheckBox::checkStateChanged, this, [this](Qt::CheckState state) {
+    toDateEdit->setEnabled(state == Qt::Checked);
+  });
 }
 
 void EvidenceFilterForm::writeAndClose() {
diff --git a/src/forms/firstRunWizard/welcomepage.cpp b/src/forms/firstRunWizard/welcomepage.cpp
@@ -120,7 +120,7 @@ WelcomePage::WelcomePage(QWidget *parent)
 
     auto hide = new QCheckBox("Do Not show when starting", this);
     hide->setChecked(AppConfig::value(CONFIG::SHOW_WELCOME_SCREEN) != "true");
-    connect(hide,&QCheckBox::stateChanged, this, [hide, this] (int newState) {
+    connect(hide, &QCheckBox::checkStateChanged, this, [this](Qt::CheckState newState) {
       if(newState != Qt::Checked)
         AppConfig::setValue(CONFIG::SHOW_WELCOME_SCREEN, "true");
       else
diff --git a/src/helpers/CMakeLists.txt b/src/helpers/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-include_directories(${Qt${QT_DEFAULT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS}/qpa)
-
 if(APPLE)
     find_library(CARBON_LIBRARY Carbon)
 endif()
@@ -41,7 +39,6 @@ target_link_libraries ( HELPERS
       Qt::Network
       Qt::Widgets
       Qt::Gui
-      Qt::GuiPrivate
 )
 
 if(APPLE)
diff --git a/src/helpers/hotkeys/uglobalhotkeys.cpp b/src/helpers/hotkeys/uglobalhotkeys.cpp
@@ -2,9 +2,8 @@
 #if defined(Q_OS_WIN)
 #include <windows.h>
 #elif defined(Q_OS_LINUX)
-#include <QWindow>
-#include <qpa/qplatformnativeinterface.h>
 #include <QApplication>
+#include <QGuiApplication>
 #endif
 
 #include "hotkeymap.h"
@@ -15,9 +14,8 @@ UGlobalHotkeys::UGlobalHotkeys(QObject *parent)
 {
 #if defined(Q_OS_LINUX)
     qApp->installNativeEventFilter(this);
-    QWindow wndw;
-    void *v = qApp->platformNativeInterface()->nativeResourceForWindow("connection", &wndw);
-    X11Connection = (xcb_connection_t *)v;
+    auto *x11App = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
+    X11Connection = x11App->connection();
     X11Wid = xcb_setup_roots_iterator(xcb_get_setup(X11Connection)).data->root;
     X11KeySymbs = xcb_key_symbols_alloc(X11Connection);
 #elif defined(Q_OS_WIN)
@@ -148,7 +146,7 @@ void UGlobalHotkeys::unregisterAllHotkeys()
 UGlobalHotkeys::~UGlobalHotkeys()
 {
 #if defined(Q_OS_WIN)
-    for (auto hotKey : qAsConst(Registered)) {
+    for (auto hotKey : std::as_const(Registered)) {
         UnregisterHotKey(nullptr, hotKey);
     }
 #elif defined(Q_OS_LINUX)
diff --git a/src/helpers/hotkeys/ukeysequence.cpp b/src/helpers/hotkeys/ukeysequence.cpp
@@ -37,7 +37,7 @@ QString UKeySequence::toString()
 QList<Qt::Key> UKeySequence::getSimpleKeys() const
 {
     QList<Qt::Key> result;
-    for (auto key : qAsConst(mKeys)) {
+    for (auto key : std::as_const(mKeys)) {
         if (!isModifier(key)) {
             result.append(key);
         }
@@ -48,7 +48,7 @@ QList<Qt::Key> UKeySequence::getSimpleKeys() const
 QList<Qt::Key> UKeySequence::getModifiers() const
 {
     QList<Qt::Key> result;
-    for (auto key : qAsConst(mKeys)) {
+    for (auto key : std::as_const(mKeys)) {
         if (isModifier(key)) {
             result.append(key);
         }
@@ -113,7 +113,7 @@ void UKeySequence::addKey(Qt::Key key)
     if (key <= 0)
         return;
 
-    for (auto testKey : qAsConst(mKeys)) {
+    for (auto testKey : std::as_const(mKeys)) {
         if (testKey == key) {
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ TagCache::TagCache(QObject *parent): QObject(parent) {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`TagCache::~TagCache() {`
`14`		`- for (auto entry : qAsConst(tagRequests)) {`
	`14`	`+ for (auto entry : std::as_const(tagRequests)) {`
`15`	`15`	`cleanUpReply(&(entry));`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class QueryResult {`
`15`	`15`	`QueryResult(QSqlQuery query) {`
`16`	`16`	`this->err = query.lastError();`
`17`	`17`	`this->query = std::move(query);`
`18`		`- this->success = err.type() == QSqlError::NoError;`
	`18`	`+ this->success = !err.isValid();`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ void EvidenceManager::loadEvidence()`
`335`	`335`
`336`	`336`	`auto filter = EvidenceFilters::parseFilter(filterTextBox->text());`
`337`	`337`	`QList<model::Evidence> operationEvidence = db->getEvidenceWithFilters(filter);`
`338`		`- if(db->lastError().type() != QSqlError::NoError){`
	`338`	`+ if(db->lastError().isValid()){`
`339`	`339`	`qWarning() << "Could not retrieve evidence for operation. Error: " << db->lastError().text();`
`340`	`340`	`}`
`341`	`341`	`evidenceTable->setRowCount(operationEvidence.size());`