Commit c5592a12 authored by David Edmundson's avatar David Edmundson
Browse files

Restore ABI of libkdecorations2.so

Restore ABI of libkdecorations2.so

requestShowWindow() was removed. Restore with an implementation that
sends an invalid QRect so that we don't need two versions throughout the
private API as well. A little bit hacky, but it should suffice
well-enough for deprecated code.

This should be ABI compatiable with the existing released
libkdecorations2.so.5
parent fac24225
......@@ -15,6 +15,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
include(ECMSetupVersion)
include(ECMGenerateHeaders)
include(ECMGenerateExportHeader)
include(FeatureSummary)
include(GenerateExportHeader)
include(CMakePackageConfigHelpers)
......
......@@ -12,7 +12,13 @@ set(libkdecoration2_SRCS
)
add_library(kdecorations2 SHARED ${libkdecoration2_SRCS})
generate_export_header(kdecorations2 EXPORT_FILE_NAME kdecoration2/kdecoration2_export.h)
ecm_generate_export_header(kdecorations2
VERSION ${PROJECT_VERSION}
EXPORT_FILE_NAME kdecoration2/kdecoration2_export.h
DEPRECATION_VERSIONS 5.21
EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT}
)
add_library(KDecoration2::KDecoration ALIAS kdecorations2)
target_link_libraries(kdecorations2
......
......@@ -164,6 +164,13 @@ DELEGATE(requestToggleKeepBelow)
#undef DELEGATE
#if KDECORATIONS2_ENABLE_DEPRECATED_SINCE(5, 21)
void Decoration::requestShowWindowMenu()
{
requestShowWindowMenu(QRect());
}
#endif
void Decoration::requestShowWindowMenu(const QRect &rect)
{
d->client->d->requestShowWindowMenu(rect);
......
......@@ -161,6 +161,19 @@ public Q_SLOTS:
void requestToggleShade();
void requestToggleKeepAbove();
void requestToggleKeepBelow();
#if KDECORATIONS2_ENABLE_DEPRECATED_SINCE(5, 21)
/**
* @deprecated
* @see requestShowWindowMenu(const QRect &rect)
*/
KDECORATIONS2_DEPRECATED_VERSION(5, 21, "Use Decoration::requestShowWindowMenu(QRect)")
void requestShowWindowMenu();
#endif
/**
* @param rect the location at which to show the window menu
*/
void requestShowWindowMenu(const QRect &rect);
void requestShowToolTip(const QString &text);
void requestHideToolTip();
......
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