Now using Qt 6.2

Author: akshaybabloo

CMakeLists.txt

@@ -14,13 +14,13 @@ include(conan_paths.cmake)
 
 # CLion setting. This will not work in Windows.
 if ($ENV{CLION_IDE})
-    set(QT_VERSION_MAJOR 5)
+    set(QT_VERSION_MAJOR 6)
     # Note: This path needs to be update on every new Qt version
     if (WIN32)
         # For some reason its not working on Windows. Use Qt Creator to make it runnable.
-        set(CMAKE_PREFIX_PATH "C:/Qt/5.15.2/msvc2019_64")
+        set(CMAKE_PREFIX_PATH "C:/Qt/6.2.1/msvc2019_64")
     elseif (APPLE)
-        set(CMAKE_PREFIX_PATH /Users/akshayrajgollahalli/Qt/5.15.2/clang_64)
+        set(CMAKE_PREFIX_PATH /Users/akshayrajgollahalli/Qt/6.2.1/macos)
     endif ()
 endif ()
 
@@ -36,7 +36,7 @@ if (WIN32)
     set(APP_ICON_RESOURCE_WINDOWS "${CMAKE_CURRENT_SOURCE_DIR}/win.rc")
 endif ()
 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets Bluetooth Network Charts Gui REQUIRED)
+find_package(QT NAMES Qt6 COMPONENTS Widgets Bluetooth Network Charts Gui REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Bluetooth REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network REQUIRED)
@@ -70,6 +70,7 @@ set(PROJECT_SOURCES
 
 if (${QT_VERSION_MAJOR} GREATER_EQUAL 6)
     qt_add_executable(DataLogger
+            MANUAL_FINALIZATION
             ${PROJECT_SOURCES}
             )
 else ()
@@ -82,6 +83,12 @@ if (APPLE)
     set_property(TARGET DataLogger PROPERTY MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist")
 endif ()
 
+set_target_properties(DataLogger PROPERTIES
+        MACOSX_BUNDLE_GUI_IDENTIFIER datalogger.gollahalli.com
+        MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+        MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+        )
+
 target_link_libraries(DataLogger PRIVATE
         Qt${QT_VERSION_MAJOR}::Widgets
         Qt${QT_VERSION_MAJOR}::Charts

chart.h

@@ -12,7 +12,6 @@
 #include <qtimer.h>
 #include <Eigen/Dense>
 
-QT_CHARTS_USE_NAMESPACE
 using namespace Eigen;
 
 class Chart : public QObject {

logger.cpp

@@ -29,7 +29,6 @@ Logger::Logger(QWidget *parent, QBluetoothDeviceInfo *deviceInfo) :
     controller = QLowEnergyController::createCentral(*deviceInfo);
     connect(controller, &QLowEnergyController::connected, this, &Logger::deviceConnected);
     connect(controller, &QLowEnergyController::disconnected, this, &Logger::deviceDisconnected);
-    connect(controller, QOverload<QLowEnergyController::Error>::of(&QLowEnergyController::error), this, &Logger::error);
 #ifdef Q_OS_WINDOWS
     connect(controller, &QLowEnergyController::serviceDiscovered, this, &Logger::addLowEnergyService,
             Qt::QueuedConnection);
@@ -62,7 +61,7 @@ Logger::Logger(QWidget *parent, QBluetoothDeviceInfo *deviceInfo) :
 
     auto theme = settings.value("theme", "light").toString();
     if (theme == "dark") {
-        chartView->chart()->setTheme(QtCharts::QChart::ChartThemeDark);
+        chartView->chart()->setTheme(QChart::ChartThemeDark);
     }
 
     ui->rightLayout->addWidget(chartView);
@@ -122,7 +121,7 @@ void Logger::deviceDisconnected() {
 
 void Logger::addLowEnergyService(const QBluetoothUuid &serviceUUID) {
     qInfo() << "New service discovered";
-    QLowEnergyService *service = controller->createServiceObject(serviceUUID);
+    QLowEnergyService *service = controller->createServiceObject(serviceUUID, this);
     if (!service) {
         qWarning() << "Cannot create service for uuid";
         return;
@@ -200,8 +199,6 @@ void Logger::connectToService(const QString &serviceUUID) {
         connect(channelSubscribeService, &QLowEnergyService::characteristicChanged, this, &Logger::updateWaveValue);
         connect(channelSubscribeService, &QLowEnergyService::descriptorWritten, this,
                 &Logger::confirmedDescriptorWrite);
-        connect(channelSubscribeService, QOverload<QLowEnergyService::ServiceError>::of(&QLowEnergyService::error),
-                this, &Logger::errorService);
 
 #ifdef Q_OS_WINDOWS
         // See https://forum.qt.io/topic/127222/issue-with-bluetooth-le-service-discovery-qlowenergyservice-unknownerror
@@ -217,10 +214,10 @@ void Logger::connectToService(const QString &serviceUUID) {
 void Logger::serviceStateChanged(QLowEnergyService::ServiceState newState) {
     qInfo() << "New state:" << newState;
     switch (newState) {
-        case QLowEnergyService::DiscoveringServices:
+        case QLowEnergyService::RemoteServiceDiscovering:
             qInfo() << tr("Discovering services...");
             break;
-        case QLowEnergyService::ServiceDiscovered: {
+        case QLowEnergyService::RemoteServiceDiscovered: {
             qInfo() << tr("Service discovered.");
 
             const QLowEnergyCharacteristic energyCharacteristic = channelSubscribeService->characteristic(
@@ -230,7 +227,7 @@ void Logger::serviceStateChanged(QLowEnergyService::ServiceState newState) {
                 break;
             }
 
-            channelSubscribeDesc = energyCharacteristic.descriptor(QBluetoothUuid::ClientCharacteristicConfiguration);
+            channelSubscribeDesc = energyCharacteristic.descriptor(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration);
             if (channelSubscribeDesc.isValid()) {
                 //qInfo() << tr("Service discovered.");
                 channelSubscribeService->writeDescriptor(channelSubscribeDesc, QByteArray::fromHex("0100"));

logger.h

@@ -10,8 +10,6 @@
 #include "serviceinfo.h"
 #include "chart.h"
 
-using namespace QtCharts;
-
 namespace Ui {
     class Logger;
 }

main.cpp

@@ -45,7 +45,6 @@ int main(int argc, char *argv[]) {
     QCoreApplication::setOrganizationDomain("gollahalli.com");
     QCoreApplication::setApplicationName("DataLogger");
 
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication::setAttribute(Qt::AA_UseOpenGLES);
 
     do {