From 214b6f4358092e431974a0ccafb1d59a17c6646c Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 1 Aug 2020 03:41:48 +0200 Subject: [PATCH] Use correct qt sparkle include for Qt 6 --- src/core/mainwindow.cpp | 8 ++++++-- src/main.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index dc3db9836..59f4af924 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -184,8 +184,12 @@ #endif #ifdef HAVE_QTSPARKLE -# include -#endif +# if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +# include +# else +# include +# endif +#endif // HAVE_QTSPARKLE const char *MainWindow::kSettingsGroup = "MainWindow"; const char *MainWindow::kAllFilesFilterSpec = QT_TR_NOOP("All Files (*)"); diff --git a/src/main.cpp b/src/main.cpp index 7a636f9ad..59a31ff00 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -78,8 +78,12 @@ #include #ifdef HAVE_QTSPARKLE -# include -#endif +# if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +# include +# else +# include +# endif +#endif // HAVE_QTSPARKLE #ifdef HAVE_DBUS # include "core/mpris.h"