Qt 6 compile fixes

Author: jlindgren90

acinclude.m4

@@ -101,12 +101,14 @@ AC_REQUIRE([AC_SYS_LARGEFILE])
 
 if test "x$GCC" = "xyes"; then
     CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
-    if test "x$HAVE_DARWIN" = "xyes"; then
-        CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
-        LDFLAGS="$LDFLAGS"
-    else
-        CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
+    CXXFLAGS="$CXXFLAGS -ffast-math -Wall -pipe"
+
+    # use C++17 if possible (Qt 6 requires it)
+    AUD_CHECK_CXXFLAGS(-std=gnu++17)
+    if [ "${CFLAGS#gnu++17}" = "$CFLAGS" ] ; then
+        CFLAGS="$CFLAGS -std=gnu++11"
     fi
+
     AUD_CHECK_CFLAGS(-Wtype-limits)
     AUD_CHECK_CFLAGS(-Wno-stringop-truncation)
     AUD_CHECK_CXXFLAGS(-Woverloaded-virtual)

src/qthotkey/plugin.cc

@@ -60,6 +60,12 @@
 
 #include <stdlib.h>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+typedef qintptr filter_result_t;
+#else
+typedef long filter_result_t;
+#endif
+
 namespace GlobalHotkeys
 {
 
@@ -81,7 +87,7 @@ class GlobalHotkeysEventFilter : public QAbstractNativeEventFilter
 {
 private:
     bool nativeEventFilter(const QByteArray & eventType, void * message,
-                           long * result) override;
+                           filter_result_t * result) override;
 };
 
 /* global vars */
@@ -454,7 +460,8 @@ void GlobalHotkeys::cleanup()
 }
 
 bool GlobalHotkeysEventFilter::nativeEventFilter(const QByteArray & eventType,
-                                                 void * message, long * result)
+                                                 void * message,
+                                                 filter_result_t * result)
 {
     Q_UNUSED(eventType);
     Q_UNUSED(result);

src/qtui/playlist_model.cc

@@ -77,9 +77,11 @@ QVariant PlaylistModel::alignment(int col) const
     case NowPlaying:
         return Qt::AlignCenter;
     case Length:
-        return Qt::AlignRight + Qt::AlignVCenter;
+        return static_cast<Qt::Alignment::Int>(Qt::AlignRight |
+                                               Qt::AlignVCenter);
     default:
-        return Qt::AlignLeft + Qt::AlignVCenter;
+        return static_cast<Qt::Alignment::Int>(Qt::AlignLeft |
+                                               Qt::AlignVCenter);
     }
 }
 

src/qtui/playlist_tabs.cc

@@ -293,7 +293,7 @@ bool PlaylistTabBar::cancelRename()
 
 void PlaylistTabBar::mousePressEvent(QMouseEvent * e)
 {
-    if (e->button() == Qt::MidButton)
+    if (e->button() == Qt::MiddleButton)
     {
         int index = tabAt(e->pos());
         if (index >= 0)

src/qtui/settings.cc

@@ -23,9 +23,6 @@
 #include <libaudcore/i18n.h>
 #include <libaudcore/preferences.h>
 
-#include <QApplication>
-#include <QDesktopWidget>
-
 const char * const qtui_defaults[] = {
     // clang-format off
     "infoarea_show_vis", "TRUE",

src/skins-qt/textbox.cc

@@ -164,7 +164,7 @@ void TextBox::render_bitmap (const char * text)
 
     auto ucs4 = QString (text).toUcs4 ();
 
-    m_buf_width = aud::max (cw * ucs4.length (), m_width);
+    m_buf_width = aud::max (cw * (int) ucs4.length (), m_width);
     m_buf.capture (new QImage (m_buf_width * config.scale, ch * config.scale,
      QImage::Format_RGB32));