diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 4d277d4..50363a6 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -4,9 +4,9 @@ project(linux VERSION 0.1 LANGUAGES CXX) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(Qt6 6.5 REQUIRED COMPONENTS Quick Widgets Bluetooth DBus) +find_package(Qt6 6.4 REQUIRED COMPONENTS Quick Widgets Bluetooth DBus) -qt_standard_project_setup(REQUIRES 6.5) +qt_standard_project_setup(REQUIRES 6.4) qt_add_executable(applinux main.cpp diff --git a/linux/ble/CMakeLists.txt b/linux/ble/CMakeLists.txt index 71f1998..43964b4 100644 --- a/linux/ble/CMakeLists.txt +++ b/linux/ble/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 6.5 REQUIRED COMPONENTS Core Bluetooth Widgets) +find_package(Qt6 6.4 REQUIRED COMPONENTS Core Bluetooth Widgets) qt_add_executable(ble_monitor main.cpp @@ -26,4 +26,4 @@ install(TARGETS ble_monitor BUNDLE DESTINATION . LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -) \ No newline at end of file +) diff --git a/linux/main.cpp b/linux/main.cpp index 280d5d3..92fb39f 100644 --- a/linux/main.cpp +++ b/linux/main.cpp @@ -367,7 +367,7 @@ private slots: } else { - parent->loadFromModule("linux", "Main"); + loadMainModule(); } } @@ -379,7 +379,7 @@ private slots: } else { - parent->loadFromModule("linux", "Main"); + loadMainModule(); } } @@ -908,6 +908,10 @@ private slots: connectToPhone(); } + void loadMainModule() { + parent->load(QUrl(QStringLiteral("qrc:/linux/Main.qml"))); + } + signals: void noiseControlModeChanged(NoiseControlMode mode); void earDetectionStatusChanged(const QString &status); @@ -995,7 +999,7 @@ int main(int argc, char *argv[]) { qmlRegisterType("me.kavishdevar.Battery", 1, 0, "Battery"); AirPodsTrayApp *trayApp = new AirPodsTrayApp(debugMode, hideOnStart, &engine); engine.rootContext()->setContextProperty("airPodsTrayApp", trayApp); - engine.loadFromModule("linux", "Main"); + trayApp->loadMainModule(); QLocalServer server; QLocalServer::removeServer("app_server"); @@ -1012,7 +1016,7 @@ int main(int argc, char *argv[]) { QObject::connect(&server, &QLocalServer::newConnection, [&]() { QLocalSocket* socket = server.nextPendingConnection(); // Handles Proper Connection - QObject::connect(socket, &QLocalSocket::readyRead, [socket, &engine]() { + QObject::connect(socket, &QLocalSocket::readyRead, [socket, &engine, &trayApp]() { QString msg = socket->readAll(); // Check if the message is "reopen", if so, trigger onOpenApp function if (msg == "reopen") { @@ -1023,7 +1027,7 @@ int main(int argc, char *argv[]) { } else { - engine.loadFromModule("linux", "Main"); + trayApp->loadMainModule(); } } else