napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

calamares: ignore about data (KF5) and highdpi

Browse Source 
The application attribute for HighDPI is gone in Qt6.
This commit is contained in:
Adriaan de Groot 2023-09-03 22:10:39 +02:00
parent 8ea7c578b3
commit e1b20fe0a9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calamares/main.cpp
View File

@ -19,7 +19,14 @@
// From 3rdparty/ // From 3rdparty/
#include "kdsingleapplication.h" #include "kdsingleapplication.h"
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
// TODO: Qt6
// Ignore KAboutData
#define HAVE_KABOUTDATA 0
#else
#include <KCoreAddons/KAboutData> #include <KCoreAddons/KAboutData>
#define HAVE_KABOUTDATA 1
#endif
#ifdef BUILD_KF5Crash #ifdef BUILD_KF5Crash
#include <KCrash/KCrash> #include <KCrash/KCrash>
#endif #endif
@ -107,9 +114,13 @@ handle_args( CalamaresApplication& a )
int int
main( int argc, char* argv[] ) 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 ); CalamaresApplication a( argc, argv );
#if HAVE_KABOUTDATA
KAboutData aboutData( "calamares", KAboutData aboutData( "calamares",
"Calamares", "Calamares",
a.applicationVersion(), a.applicationVersion(),
@ -120,6 +131,7 @@ main( int argc, char* argv[] )
"https://calamares.io", "https://calamares.io",
"https://github.com/calamares/calamares/issues" ); "https://github.com/calamares/calamares/issues" );
KAboutData::setApplicationData( aboutData ); KAboutData::setApplicationData( aboutData );
#endif
a.setApplicationDisplayName( QString() ); // To avoid putting an extra "Calamares/" into the log-file a.setApplicationDisplayName( QString() ); // To avoid putting an extra "Calamares/" into the log-file
#ifdef BUILD_KF5Crash #ifdef BUILD_KF5Crash