Page MenuHome GnuPG
Paste P46

qt6 kleo hacks for windows
ActivePublic
Actions

Authored by aheinecke on Thu, Apr 4, 5:16 PM.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88c19410a..a7488d202 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ set(KF_MIN_VERSION "6.0.0")
set(KIDENTITYMANAGEMENT_VERSION "6.0.40")
set(KMAILTRANSPORT_VERSION "6.0.40")
set(AKONADI_MIME_VERSION "6.0.40")
-set(KMIME_VERSION "6.0.40")
+set(KMIME_VERSION "6.0.0")
set(LIBKLEO_VERSION "6.0.50")
set(QT_REQUIRED_VERSION "6.6.0")
set(MIMETREEPARSER_VERSION "6.0.40")
diff --git a/src/kleopatraapplication.cpp b/src/kleopatraapplication.cpp
index 720b2ee4e..8b0c4be03 100644
--- a/src/kleopatraapplication.cpp
+++ b/src/kleopatraapplication.cpp
@@ -75,7 +75,7 @@
#include <KSharedConfig>
#include <memory>
-#ifdef Q_OS_WIN
+#if 0
#include <QtPlatformHeaders/QWindowsWindowFunctions>
#endif
@@ -307,7 +307,7 @@ KleopatraApplication::KleopatraApplication(int &argc, char *argv[])
void KleopatraApplication::init()
{
-#ifdef Q_OS_WIN
+#if 0
QWindowsWindowFunctions::setWindowActivationBehavior(QWindowsWindowFunctions::AlwaysActivateWindow);
#endif
const auto blockedUrlSchemes = Settings{}.blockedUrlSchemes();
diff --git a/src/utils/accessibility.cpp b/src/utils/accessibility.cpp
index be7eee9f0..c1ab86db9 100644
--- a/src/utils/accessibility.cpp
+++ b/src/utils/accessibility.cpp
@@ -14,7 +14,7 @@
#include <KLocalizedString>
#include <QAction>
-#ifdef Q_OS_WIN
+#if 0
#include <QApplication>
#include <QDesktopWidget>
#endif
@@ -125,7 +125,7 @@ namespace
{
static void notifyAccessibilityClientsAboutToolTip(const QPoint &pos, QWidget *parent)
{
-#ifdef Q_OS_WIN
+#if 0
// On Windows, the tool tip's parent widget is a desktop screen widget (see implementation of QToolTip::showText)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED