kdepim-runtime
This commit is contained in:
@@ -569,7 +569,7 @@ index 6a1785fcf9..aa94cad1ab 100644
|
||||
+ {QStringLiteral("scopes"), scopes.join(QLatin1Char(','))},
|
||||
+ };
|
||||
|
||||
// Legacy: store the map exactly like Kwallet is doing it
|
||||
// Legacy: store the map exactly like kwallet is doing it
|
||||
QByteArray mapData;
|
||||
diff --git a/resources/google-groupware/googlesettings.h b/resources/google-groupware/googlesettings.h
|
||||
index f689dc7748..0ec4c3c34e 100644
|
||||
@@ -631,7 +631,7 @@ index d418652d6f..0000000000
|
||||
-#include <KGAPI/Tasks/TaskList>
|
||||
-#include <KGAPI/Tasks/TaskListFetchJob>
|
||||
-#include <KMessageBox>
|
||||
-#include <KWindowSystem>
|
||||
-#include <kwindowsystem>
|
||||
-
|
||||
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
-#include <qt5keychain/keychain.h>
|
||||
@@ -650,7 +650,7 @@ index d418652d6f..0000000000
|
||||
-{
|
||||
- if (wId) {
|
||||
- setAttribute(Qt::WA_NativeWindow, true);
|
||||
- KWindowSystem::setMainWindow(windowHandle(), wId);
|
||||
- kwindowsystem::setMainWindow(windowHandle(), wId);
|
||||
- }
|
||||
- auto mainLayout = new QVBoxLayout(this);
|
||||
-
|
||||
@@ -942,7 +942,7 @@ index 0000000000..2543c4c6b8
|
||||
+#include <KGAPI/Tasks/TaskList>
|
||||
+#include <KGAPI/Tasks/TaskListFetchJob>
|
||||
+#include <KMessageBox>
|
||||
+#include <KWindowSystem>
|
||||
+#include <kwindowsystem>
|
||||
+
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
+#include <qt5keychain/keychain.h>
|
||||
|
||||
Reference in New Issue
Block a user