diff options
| -rw-r--r-- | cmake/opentrack-qt.cmake | 6 | ||||
| -rw-r--r-- | opentrack/new_file_dialog.h | 1 | ||||
| -rw-r--r-- | tracker-s2bot/ftnoir_tracker_s2bot.cpp | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index 8f6dc70e..51d48595 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -1,7 +1,7 @@ include_guard(GLOBAL) -set(qt-required-components Core Network Widgets LinguistTools Gui Core5Compat) +set(qt-required-components Core Network Widgets LinguistTools Gui) set(qt-optional-components SerialPort) -set(qt-imported-targets Qt6::Core Qt6::Gui Qt6::Network Qt6::Widgets Qt6::Core5Compat) +set(qt-imported-targets Qt6::Core Qt6::Gui Qt6::Network Qt6::Widgets) if(APPLE) list(APPEND qt-required-components "DBus") list(APPEND qt-optional-components "Multimedia") @@ -14,7 +14,7 @@ if(WIN32) find_package(Qt6Gui REQUIRED COMPONENTS QWindowsIntegrationPlugin) endif() -set(MY_QT_LIBS ${Qt6Core_LIBRARIES} ${Qt6Gui_LIBRARIES} ${Qt6Widgets_LIBRARIES} ${Qt6Network_LIBRARIES} ${Qt6Core5Compat_LIBRARIES}) +set(MY_QT_LIBS ${Qt6Core_LIBRARIES} ${Qt6Gui_LIBRARIES} ${Qt6Widgets_LIBRARIES} ${Qt6Network_LIBRARIES}) if(APPLE) list(APPEND MY_QT_LIBS ${Qt6Multimedia_LIBRARIES} ${Qt6DBus_LIBRARIES}) endif() diff --git a/opentrack/new_file_dialog.h b/opentrack/new_file_dialog.h index 7244e524..9e3c86a6 100644 --- a/opentrack/new_file_dialog.h +++ b/opentrack/new_file_dialog.h @@ -3,7 +3,6 @@ #include "ui_new_config.h" #include "options/options.hpp" #include <QFile> -#include <QRegExp> #include <QString> #include <QMessageBox> diff --git a/tracker-s2bot/ftnoir_tracker_s2bot.cpp b/tracker-s2bot/ftnoir_tracker_s2bot.cpp index bf39b367..53762c66 100644 --- a/tracker-s2bot/ftnoir_tracker_s2bot.cpp +++ b/tracker-s2bot/ftnoir_tracker_s2bot.cpp @@ -7,7 +7,6 @@ #include <cmath> #include <QNetworkRequest> #include <QNetworkReply> -#include <QtCore5Compat/QRegExp> tracker_s2bot::tracker_s2bot() : pose { 0,0,0, 0,0,0 }, m_nam (std::make_unique<QNetworkAccessManager>()) { |