From b2944938471de15d95e0c7a3671b2bc7de102487 Mon Sep 17 00:00:00 2001 From: François Andriot 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 (cherry picked from commit ba5f58bf38a62eb83990951168951274c96a8e24) --- buildtools/custommakefiles/customprojectpart.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'buildtools/custommakefiles/customprojectpart.cpp') diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index f61782ae..cbbb4315 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -62,11 +62,11 @@ #include typedef KDevGenericFactory CustomProjectFactory; -static const KDevPluginInfo data( "kdevcustomproject" ); -K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) +static const KDevPluginInfo pluginData( "kdevcustomproject" ); +K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( pluginData ) ) CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) - : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) + : KDevBuildTool( &pluginData, parent, name ? name : "CustomProjectPart" ) , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) { setInstance( CustomProjectFactory::instance() ); -- cgit v1.2.3