From b6e54aacde4c922cc681322f7e1a4b39f44cb992 Mon Sep 17 00:00:00 2001
From: stefonarch <standreas@riseup.net>
Date: Sat, 10 Feb 2024 08:46:03 +0100
Subject: [PATCH] Port to Qt6

---
 CMakeLists.txt     | 13 ++++++-------
 src/CMakeLists.txt |  2 +-
 src/pavucontrol.cc |  3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 098f888..96c8807 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,17 +19,16 @@ include(GNUInstallDirs)
 
 # Minimum Versions
 set(GLIB_MINIMUM_VERSION "2.50.0")
-set(LXQTBT_MINIMUM_VERSION "0.13.0")
-set(QT_MINIMUM_VERSION "5.15.0")
+set(LXQTBT_MINIMUM_VERSION "2.0.0")
+set(QT_MINIMUM_VERSION "6.6.0")
 
-find_package(Qt5Widgets ${QT_MINIMUM_VERSION} REQUIRED)
-find_package(Qt5LinguistTools ${QT_MINIMUM_VERSION} REQUIRED)
-find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
+find_package(Qt6 ${QT_MINIMUM_VERSION} COMPONENTS REQUIRED Widgets LinguistTools)
+find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
 
 find_package(GLIB ${GLIB_MINIMUM_VERSION} REQUIRED)
 
-set(PAVUCONTROLQT_MAJOR_VERSION 1)
-set(PAVUCONTROLQT_MINOR_VERSION 4)
+set(PAVUCONTROLQT_MAJOR_VERSION 2)
+set(PAVUCONTROLQT_MINOR_VERSION 0)
 set(PAVUCONTROLQT_PATCH_VERSION 0)
 set(PAVUCONTROLQT_VERSION ${PAVUCONTROLQT_MAJOR_VERSION}.${PAVUCONTROLQT_MINOR_VERSION}.${PAVUCONTROLQT_PATCH_VERSION})
 add_definitions("-DPAVUCONTROLQT_VERSION=\"${PAVUCONTROLQT_VERSION}\"")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7dd356c..6ddb824 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -73,7 +73,7 @@ set_property(
 )
 
 target_link_libraries(pavucontrol-qt
-    Qt5::Widgets
+    Qt6::Widgets
     ${PULSE_LDFLAGS}
     ${GLIB_LDFLAGS}
 )
diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
index 53873c6..198c03c 100644
--- a/src/pavucontrol.cc
+++ b/src/pavucontrol.cc
@@ -649,11 +649,10 @@ int main(int argc, char *argv[]) {
     QApplication app(argc, argv);
 
     app.setOrganizationName(QStringLiteral("pavucontrol-qt"));
-    app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
 
     QString locale = QLocale::system().name();
     QTranslator qtTranslator;
-    if(qtTranslator.load(QStringLiteral("qt_") + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+    if(qtTranslator.load(QStringLiteral("qt_") + locale, QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
         qApp->installTranslator(&qtTranslator);
 
     QTranslator appTranslator;