Update for QtCreator 12

VikingGuenter · Nov 24, 2023 · 41d209b · 41d209b
1 parent 005d194
commit 41d209b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -6,8 +6,8 @@ on:
 
 env:
   PLUGIN_NAME: SIGBUILD
-  QT_VERSION: 6.4.3
-  QT_CREATOR_VERSION: 11.0.3
+  QT_VERSION: 6.6.0
+  QT_CREATOR_VERSION: 12.0.0
   QT_CREATOR_SNAPSHOT: NO
   CMAKE_VERSION: 3.24.2
   NINJA_VERSION: 1.10.2
@@ -125,7 +125,7 @@ jobs:
           if("${qt_version_major}" STREQUAL "5")
             set(qt_package_suffix "-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64")
           else()
-            set(qt_package_suffix "-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64")
+            set(qt_package_suffix "-Linux-RHEL_8_6-GCC-Linux-RHEL_8_6-X86_64")
           endif()
         endif()
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(SIGBUILD LANGUAGES CXX VERSION 0.4.3)
+project(SIGBUILD LANGUAGES CXX VERSION 0.4.4)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)

diff --git a/SIGBUILD.json.in b/SIGBUILD.json.in
@@ -1,12 +1,12 @@
 {
-    \"Name\" : \"SIGBUILD\",
-    \"Version\" : \"0.4.3\",
-    \"CompatVersion\" : \"0.4.3\",
-    \"Vendor\" : \"Davide Coppola\",
-    \"Copyright\" : \"(C) Davide Coppola\",
-    \"License\" : \"GPL v3.\",
-    \"Category\" : \"Qt Creator\",
-    \"Description\" : \"This plugin notifies you when a build ends.\",
-    \"Url\" : \"http://sigbuild.com\",
-    $$dependencyList
+    "Name" : "SIGBUILD",
+    "Version" : "0.4.4",
+    "CompatVersion" : "0.4.4",
+    "Vendor" : "Davide Coppola",
+    "Copyright" : "(C) Davide Coppola",
+    "License" : "GPL v3.",
+    "Category" : "Qt Creator",
+    "Description" : "This plugin notifies you when a build ends.",
+    "Url" : "http://sigbuild.com",
+    ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/OptionsPageMain.cpp b/src/OptionsPageMain.cpp
@@ -14,7 +14,7 @@ OptionsPageMain::OptionsPageMain(Settings * settings, QObject * parent)
     setDisplayName("General");
     setCategory("SIGBUILD");
     setDisplayCategory("SIGBUILD");
-    setCategoryIcon(Utils::Icon(":/img/icon.png"));
+    setCategoryIconPath((":/img/icon.png"));
 }
 
 QWidget * OptionsPageMain::widget()

diff --git a/src/Settings.cpp b/src/Settings.cpp
@@ -1,21 +1,22 @@
 #include "Settings.h"
 
 #include <coreplugin/icore.h>
+#include <utils/qtcsettings.h>
 
 namespace Sigbuild
 {
 
 // -- KEYS --
-const QString GROUP("SIGBUILD");
-const QString OPT_SYSTRAY_ENABLED("SYSTRAY_ENABLED");
-const QString OPT_SYSTRAY_NOTIFY_ENABLED("SYSTRAY_NOTIFY_ENABLED");
-const QString OPT_SYSTRAY_NOTIFY_WHEN_ACTIVE("SYSTRAY_NOTIFY_WHEN_ACTIVE");
-const QString OPT_SYSTRAY_MIN_BUILD_TIME("SYSTRAY_MIN_BUILD_TIME");
-const QString OPT_SYSTRAY_NOTIFY_TIME("SYSTRAY_NOTIFY_TIME");
-const QString OPT_AUDIO_ENABLED("AUDIO_ENABLED");
-const QString OPT_AUDIO_NOTIFY_WHEN_ACTIVE("AUDIO_NOTIFY_WHEN_ACTIVE");
-const QString OPT_AUDIO_VOLUME("AUDIO_VOLUME");
-const QString OPT_AUDIO_MIN_BUILD_TIME("AUDIO_MIN_BUILD_TIME");
+const QByteArray GROUP("SIGBUILD");
+const QByteArray OPT_SYSTRAY_ENABLED("SYSTRAY_ENABLED");
+const QByteArray OPT_SYSTRAY_NOTIFY_ENABLED("SYSTRAY_NOTIFY_ENABLED");
+const QByteArray OPT_SYSTRAY_NOTIFY_WHEN_ACTIVE("SYSTRAY_NOTIFY_WHEN_ACTIVE");
+const QByteArray OPT_SYSTRAY_MIN_BUILD_TIME("SYSTRAY_MIN_BUILD_TIME");
+const QByteArray OPT_SYSTRAY_NOTIFY_TIME("SYSTRAY_NOTIFY_TIME");
+const QByteArray OPT_AUDIO_ENABLED("AUDIO_ENABLED");
+const QByteArray OPT_AUDIO_NOTIFY_WHEN_ACTIVE("AUDIO_NOTIFY_WHEN_ACTIVE");
+const QByteArray OPT_AUDIO_VOLUME("AUDIO_VOLUME");
+const QByteArray OPT_AUDIO_MIN_BUILD_TIME("AUDIO_MIN_BUILD_TIME");
 
 // -- DEFAULTS --
 const bool DEF_SYSTRAY_ENABLED                      = true;
@@ -42,7 +43,7 @@ Settings::Settings()
 
 void Settings::Load()
 {
-    QSettings * globalSettings = Core::ICore::settings();
+    Utils::QtcSettings *globalSettings = Core::ICore::settings();
 
     globalSettings->beginGroup(GROUP);
 
@@ -66,7 +67,7 @@ void Settings::Load()
 
 void Settings::Save()
 {
-    QSettings * globalSettings = Core::ICore::settings();
+    Utils::QtcSettings *globalSettings = Core::ICore::settings();
 
     globalSettings->beginGroup(GROUP);
 

diff --git a/src/SigbuildPlugin.cpp b/src/SigbuildPlugin.cpp
@@ -7,7 +7,6 @@
 #include "Settings.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/mainwindow.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectnodes.h>