Commit 2e3b789f authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile without kf5 deprecated methods

parent e8057840
......@@ -78,6 +78,7 @@ install(EXPORT KF5KontactInterfaceTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR
if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
endif()
add_definitions(-DQT_NO_FOREACH)
......
......@@ -190,7 +190,8 @@ int PimUniqueApplication::newInstance(const QByteArray &startupId,
for (QWidget *win : tlws) {
if (qobject_cast<QMainWindow *>(win)) {
win->show();
KStartupInfo::setNewStartupId(win, startupId); // this moves 'win' to the current desktop
win->setAttribute(Qt::WA_NativeWindow, true);
KStartupInfo::setNewStartupId(win->windowHandle(), startupId); // this moves 'win' to the current desktop
#ifdef Q_OS_WIN
KWindowSystem::forceActiveWindow(win->winId());
#endif
......
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