X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5d3774aa17c8e04df928e37fc4d1e197c3e3ae68..28a74d178071c89dbdc53a193c1db68e0d10ddcb:/src/main.cpp diff --git a/src/main.cpp b/src/main.cpp index 8c48bb857..8661a3d17 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,8 +12,8 @@ #include "dolphindebug.h" #include "dolphinmainwindow.h" #include "global.h" -#include "config-kuserfeedback.h" -#ifdef HAVE_KUSERFEEDBACK +#include "config-dolphin.h" +#if HAVE_KUSERFEEDBACK #include "userfeedback/dolphinfeedbackprovider.h" #endif @@ -65,9 +65,10 @@ int main(int argc, char **argv) /** * enable high dpi support */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); - +#endif QApplication app(argc, argv); app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon())); @@ -237,7 +238,7 @@ int main(int argc, char **argv) } } -#ifdef HAVE_KUSERFEEDBACK +#if HAVE_KUSERFEEDBACK auto feedbackProvider = DolphinFeedbackProvider::instance(); Q_UNUSED(feedbackProvider) #endif