From 84f393fe2ace2c91c5278818079ee256192365ae Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 5 Aug 2017 04:09:02 +0000 Subject: [PATCH] adjust designer component to plugin pattern changes Signed-off-by: Ivailo Monev --- src/designer/components/qdesigner_components.cpp | 2 +- src/gui/qguicommon_p.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/designer/components/qdesigner_components.cpp b/src/designer/components/qdesigner_components.cpp index 075bb7634..4091a6475 100644 --- a/src/designer/components/qdesigner_components.cpp +++ b/src/designer/components/qdesigner_components.cpp @@ -75,7 +75,7 @@ class Static##PLUGIN##PluginInstance { public: \ Static##PLUGIN##PluginInstance() { \ QT_PREPEND_NAMESPACE(qRegisterStaticPluginInstanceFunction) \ - (&qt_plugin_instance_##PLUGIN); \ + (&kt_plugin_instance_##PLUGIN); \ } \ }; diff --git a/src/gui/qguicommon_p.h b/src/gui/qguicommon_p.h index 3cef45218..1148d8721 100644 --- a/src/gui/qguicommon_p.h +++ b/src/gui/qguicommon_p.h @@ -24,9 +24,7 @@ Q_GLOBAL_STATIC(QWidget, globalStyleInfoWidget) #if !defined(QT_NO_LIBRARY) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, iconloader, (QIconEngineFactoryInterface_iid, QLatin1String("/iconengines"), Qt::CaseInsensitive)) -#endif -#if !defined(QT_NO_LIBRARY) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, imageloader, (QImageIOHandlerFactoryInterface_iid, QLatin1String("/imageformats"))) #endif -- 2.11.0