diff options
author | François Andriot <francois.andriot@free.fr> | 2021-02-28 00:15:56 +0000 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-13 09:04:39 +0900 |
commit | b2944938471de15d95e0c7a3671b2bc7de102487 (patch) | |
tree | 232083f93b64806341a7f8c720b6b4d3870885f2 /parts/scripting | |
parent | f1d98e1263bb48e9e23ff9eb137097b5335c8e05 (diff) | |
download | tdevelop-b2944938471de15d95e0c7a3671b2bc7de102487.tar.gz tdevelop-b2944938471de15d95e0c7a3671b2bc7de102487.zip |
Fix ftbfs on Fedora 34
error: reference to ‘data’ is ambiguous
Signed-off-by: François Andriot <francois.andriot@free.fr>
(cherry picked from commit ba5f58bf38a62eb83990951168951274c96a8e24)
Diffstat (limited to 'parts/scripting')
-rw-r--r-- | parts/scripting/scriptingpart.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index 80a33c9e..d0558b79 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -41,14 +41,14 @@ #include "tdescriptactionmanager.h" typedef KDevGenericFactory<scriptingPart> scriptingFactory; -KDevPluginInfo data("kdevscripting"); -K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) ) +KDevPluginInfo pluginData("kdevscripting"); +K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( pluginData ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) + : KDevPlugin(&pluginData, parent, name ? name : "scriptingPart"), m_scripts(0L) { setInstance(scriptingFactory::instance()); setXMLFile("kdevscripting.rc"); |