From 0e5da8f18d84457b72f5842dc10a6a5a7090ad32 Mon Sep 17 00:00:00 2001
From: Bas Schouten <bas@basschouten.com>
Date: Mon, 14 Aug 2023 23:55:42 +0200
Subject: [PATCH] Update app to Qt 6.5 and update IP.

---
 CMakeLists.txt       |  6 ++++--
 main.qml => Main.qml |  2 +-
 main.cpp             | 11 ++++-------
 mqttinterface.cpp    |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)
 rename main.qml => Main.qml (97%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff02d94..11378e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,9 @@ project(qthomecontrol VERSION 0.1 LANGUAGES CXX)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(Qt6 6.2 COMPONENTS Quick REQUIRED)
+find_package(Qt6 6.5 COMPONENTS Quick REQUIRED)
+
+qt_standard_project_setup(REQUIRES 6.5)
 
 if (UNIX)
     add_subdirectory ("paho.mqtt.c")
@@ -20,7 +22,7 @@ qt_add_executable(appqthomecontrol
 qt_add_qml_module(appqthomecontrol
     URI qthomecontrol
     VERSION 1.0
-    QML_FILES main.qml 
+    QML_FILES Main.qml
     SOURCES
       mqttinterface.h mqttinterface.cpp
 )
diff --git a/main.qml b/Main.qml
similarity index 97%
rename from main.qml
rename to Main.qml
index b5b938d..7b52a7a 100644
--- a/main.qml
+++ b/Main.qml
@@ -8,7 +8,7 @@ Window {
     height: 720
     visible: true
     color: "#000000"
-    title: qsTr("Hello World")
+    title: qsTr("Home Control")
 
     MQTTInterface {
         id: mqttinterface
diff --git a/main.cpp b/main.cpp
index e4ddce2..6086143 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,13 +7,10 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    const QUrl url(u"qrc:/qthomecontrol/main.qml"_qs);
-    QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
-                     &app, [url](QObject *obj, const QUrl &objUrl) {
-        if (!obj && url == objUrl)
-            QCoreApplication::exit(-1);
-    }, Qt::QueuedConnection);
-    engine.load(url);
+    QObject::connect(&engine, &QQmlApplicationEngine::objectCreationFailed,
+        &app, []() { QCoreApplication::exit(-1); },
+        Qt::QueuedConnection);
+    engine.loadFromModule("qthomecontrol", "Main");
 
     return app.exec();
 }
diff --git a/mqttinterface.cpp b/mqttinterface.cpp
index cb8b81d..2958895 100644
--- a/mqttinterface.cpp
+++ b/mqttinterface.cpp
@@ -46,7 +46,7 @@ MQTTInterface::MQTTInterface(QObject *parent)
     MQTTClient_deliveryToken token;
 
     int rc;
-    MQTTClient_create(&mClient, "tcp://10.0.1.213:1883", "bedroom-thermostat-fe",
+    MQTTClient_create(&mClient, "tcp://10.0.1.225:1883", "bedroom-thermostat-fe",
       MQTTCLIENT_PERSISTENCE_NONE, NULL);
 
     if ((rc = MQTTClient_setCallbacks(mClient, this, connlost, msgarrvd, delivered)) != MQTTCLIENT_SUCCESS)
-- 
2.47.3