Commit 876839a5 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: it compiles fine without kf5 deprecated method

parent fdf5636d
......@@ -144,6 +144,14 @@ option(NO_REGENERATE_MIME "Don't regenerate mime file (developer-only option)" F
if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
endif()
add_definitions(
-DKCOREADDONS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000
-DKWINDOWSYSTEM_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000
-DKWIDGETSADDONS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000
-DKPARTS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000
-DKTEXTWIDGETS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000
-DKSERVICE_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
find_package(Xsltproc)
set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
......
......@@ -57,7 +57,7 @@ void MigrationAgent::configure(WId windowId)
dlg->resize(600, 300);
if (windowId) {
KWindowSystem::setMainWindow(dlg, windowId);
KWindowSystem::setMainWindow(dlg->windowHandle(), windowId);
}
dlg->show();
}
......
......@@ -193,7 +193,7 @@ void DavGroupwareResource::configure(WId windowId)
SetupWizard wizard;
if (windowId) {
KWindowSystem::setMainWindow(&wizard, windowId);
KWindowSystem::setMainWindow(wizard.windowHandle(), windowId);
}
const int result = wizard.exec();
......@@ -226,7 +226,7 @@ void DavGroupwareResource::configure(WId windowId)
ConfigDialog dialog;
if (windowId) {
KWindowSystem::setMainWindow(&dialog, windowId);
KWindowSystem::setMainWindow(dialog.windowHandle(), windowId);
}
if (!Settings::self()->defaultUsername().isEmpty()) {
......
......@@ -67,7 +67,7 @@ EwsConfigDialog::EwsConfigDialog(EwsResource *parentResource, EwsClient &client,
, mSettings(settings)
{
if (wId) {
KWindowSystem::setMainWindow(this, wId);
KWindowSystem::setMainWindow(windowHandle(), wId);
}
QVBoxLayout *mainLayout = new QVBoxLayout(this);
......
......@@ -40,7 +40,7 @@ EwsMtaConfigDialog::EwsMtaConfigDialog(EwsMtaResource *parentResource, WId wId)
, mParentResource(parentResource)
{
if (wId) {
KWindowSystem::setMainWindow(this, wId);
KWindowSystem::setMainWindow(windowHandle(), wId);
}
QWidget *mainWidget = new QWidget(this);
......
......@@ -47,7 +47,7 @@ GoogleSettingsDialog::GoogleSettingsDialog(GoogleAccountManager *accountManager,
, m_parentResource(parent)
, m_accountManager(accountManager)
{
KWindowSystem::setMainWindow(this, wId);
KWindowSystem::setMainWindow(windowHandle(), wId);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
QVBoxLayout *topLayout = new QVBoxLayout(this);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
......
......@@ -72,7 +72,7 @@ QByteArray ImapResource::clientId() const
QDialog *ImapResource::createConfigureDialog(WId windowId)
{
SetupServer *dlg = new SetupServer(this, windowId);
KWindowSystem::setMainWindow(dlg, windowId);
KWindowSystem::setMainWindow(dlg->windowHandle(), windowId);
dlg->setWindowTitle(i18n("IMAP Account Settings"));
dlg->setWindowIcon(QIcon::fromTheme(QStringLiteral("network-server")));
connect(dlg, &SetupServer::finished, this, &ImapResource::onConfigurationDone);
......
......@@ -264,7 +264,7 @@ int ImapResourceBase::configureSubscription(qlonglong windowId)
mSubscriptions = new SubscriptionDialog(nullptr, SubscriptionDialog::AllowToEnableSubscription);
if (windowId) {
KWindowSystem::setMainWindow(mSubscriptions, windowId);
KWindowSystem::setMainWindow(mSubscriptions->windowHandle(), windowId);
}
mSubscriptions->setWindowTitle(i18nc("@title:window", "Serverside Subscription"));
mSubscriptions->setWindowIcon(QIcon::fromTheme(QStringLiteral("network-server")));
......
......@@ -83,7 +83,7 @@ void SettingsPasswordRequester::askUserInput(const QString &serverError)
connect(dialog, &QDialog::destroyed, this, &SettingsPasswordRequester::onDialogDestroyed);
m_requestDialog = dialog;
KWindowSystem::setMainWindow(dialog, m_resource->winIdForDialogs());
KWindowSystem::setMainWindow(dialog->windowHandle(), m_resource->winIdForDialogs());
bool checkboxResult = false;
KMessageBox::createKMessageBox(dialog, buttonBox, QMessageBox::Information,
text, QStringList(),
......
......@@ -54,7 +54,7 @@ SettingsDialog::SettingsDialog(WId windowId, Settings *settings)
setWindowTitle(i18nc("@title", "Configure Calendar"));
if (windowId) {
KWindowSystem::setMainWindow(this, windowId);
KWindowSystem::setMainWindow(windowHandle(), windowId);
}
// Make directory path read-only if the resource already exists
......
......@@ -95,7 +95,7 @@ QByteArray KolabResource::clientId() const
QDialog *KolabResource::createConfigureDialog(WId windowId)
{
SetupServer *dlg = new SetupServer(this, windowId);
KWindowSystem::setMainWindow(dlg, windowId);
KWindowSystem::setMainWindow(dlg->windowHandle(), windowId);
dlg->setWindowTitle(i18n("Kolab Account Settings"));
dlg->setWindowIcon(QIcon::fromTheme(QStringLiteral("kolab")));
connect(dlg, &QDialog::finished, this, &KolabResource::onConfigurationDone);
......
Markdown is supported
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