From b2944938471de15d95e0c7a3671b2bc7de102487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
Date: Sun, 28 Feb 2021 00:15:56 +0000
Subject: Fix ftbfs on Fedora 34
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

error: reference to ‘data’ is ambiguous

Signed-off-by: François Andriot <francois.andriot@free.fr>
(cherry picked from commit ba5f58bf38a62eb83990951168951274c96a8e24)
---
 languages/java/javasupportfactory.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'languages/java/javasupportfactory.cpp')

diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
index 94e435f2..299e283f 100644
--- a/languages/java/javasupportfactory.cpp
+++ b/languages/java/javasupportfactory.cpp
@@ -14,11 +14,11 @@
 #include <kdevplugininfo.h>
 #include "javasupportfactory.h"
 
-static const KDevPluginInfo data("kdevjavasupport");
+static const KDevPluginInfo pluginData("kdevjavasupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory )
 
 JavaSupportFactory::JavaSupportFactory()
-    : KDevGenericFactory<JavaSupportPart>( data )
+    : KDevGenericFactory<JavaSupportPart>( pluginData )
 {
 }
 
@@ -34,6 +34,6 @@ TDEInstance *JavaSupportFactory::createInstance()
 
 const KDevPluginInfo *JavaSupportFactory::info()
 {
-    return &data;
+    return &pluginData;
 }
 
-- 
cgit v1.2.1