Commit 5110d153 authored by Volker Krause's avatar Volker Krause
Browse files

Don't pretend we have a parent window for opening the wallet

Abusing the desktop widget for that is as good as not using any.

This also completes the Qt6 port.
parent 1412c4ab
Pipeline #167070 passed with stage
in 1 minute and 25 seconds
......@@ -4,3 +4,4 @@
include:
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
......@@ -16,7 +16,6 @@
#include <QApplication>
#include <QCommandLineOption>
#include <QCommandLineParser>
#include <QDesktopWidget>
#include <QInputDialog>
#include <QLoggingCategory>
#include <QPointer>
......@@ -283,8 +282,7 @@ int main(int argc, char **argv)
}
// Open KWallet to see if an item was previously stored
WId winId = QApplication::desktop()->winId();
std::unique_ptr<KWallet::Wallet> wallet(ignoreWallet ? nullptr : KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), winId));
std::unique_ptr<KWallet::Wallet> wallet(ignoreWallet ? nullptr : KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0));
if ((!ignoreWallet) && (!identifier.isNull()) && wallet.get() && wallet->hasFolder(walletFolder)) {
wallet->setFolder(walletFolder);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment