From 7193818921ca485d41a313d91fc48404584989b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 23 Jul 2013 07:11:52 +0200 Subject: [PATCH] Remove workaround for legacy stable decorations In KWin5 decorations need to have the macro. --- libkdecorations/kdecoration_plugins_p.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libkdecorations/kdecoration_plugins_p.cpp b/libkdecorations/kdecoration_plugins_p.cpp index 58e60bc441..d4e9a50730 100644 --- a/libkdecorations/kdecoration_plugins_p.cpp +++ b/libkdecorations/kdecoration_plugins_p.cpp @@ -159,19 +159,6 @@ bool KDecorationPlugins::canLoad(QString nameStr, KLibrary **loadedLib) if (version_func) { vptr = (int(*)())version_func; deco_version = vptr(); - } else { - // block some decos known to link the unstable API but (for now) let through other legacy stuff - const bool isLegacyStableABI = !(nameStr.contains("qtcurve", Qt::CaseInsensitive) || - nameStr.contains("crystal", Qt::CaseInsensitive) || - nameStr.contains("oxygen", Qt::CaseInsensitive)); - if (isLegacyStableABI) { - // it's an old build of a legacy decoration that very likely uses the stable API - // so we just set the API version to the current one - // TODO: remove for 4.9.x or 4.10 - this is just to cover recompiles - deco_version = KWIN_DECORATION_API_VERSION; - } - kWarning(1212) << QString("****** The library %1 has no API version ******").arg(path); - kWarning(1212) << "****** Please use the KWIN_DECORATION macro in extern \"C\" to get this decoration loaded in future versions of kwin"; } if (deco_version != KWIN_DECORATION_API_VERSION) { if (version_func)