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 /buildtools/qmake | |
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 'buildtools/qmake')
-rw-r--r-- | buildtools/qmake/trollprojectpart.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 0b3d4178..273db855 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -57,11 +57,11 @@ #include <urlutil.h> typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory; -static const KDevPluginInfo data("kdevtrollproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevtrollproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( pluginData ) ) TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) - : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); |