diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp index 80a2b3a62..5dfac4a29 100644 --- a/src/calamares/main.cpp +++ b/src/calamares/main.cpp @@ -19,7 +19,14 @@ // From 3rdparty/ #include "kdsingleapplication.h" +#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) +// TODO: Qt6 +// Ignore KAboutData +#define HAVE_KABOUTDATA 0 +#else #include +#define HAVE_KABOUTDATA 1 +#endif #ifdef BUILD_KF5Crash #include #endif @@ -107,9 +114,13 @@ handle_args( CalamaresApplication& a ) int main( int argc, char* argv[] ) { - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + // Not needed in Qt6 + QApplication::setAttribute( Qt::AA_EnableHighDpiScaling ); +#endif CalamaresApplication a( argc, argv ); +#if HAVE_KABOUTDATA KAboutData aboutData( "calamares", "Calamares", a.applicationVersion(), @@ -120,6 +131,7 @@ main( int argc, char* argv[] ) "https://calamares.io", "https://github.com/calamares/calamares/issues" ); KAboutData::setApplicationData( aboutData ); +#endif a.setApplicationDisplayName( QString() ); // To avoid putting an extra "Calamares/" into the log-file #ifdef BUILD_KF5Crash