From 4fb7eb0da74798205f5cac693c921065492fa33e Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 6 Jan 2016 12:18:40 +0100 Subject: Drop most "#ifndef QT_NO_LIBRARY" As we can load plugins without QLibrary now, we don't have to #ifdef out the code that does so anymore. Change-Id: I1dc20216830a882dbd5a1b431183407e6b19c837 Reviewed-by: Friedemann Kleint Reviewed-by: Thiago Macieira --- src/gui/accessible/qaccessible.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/gui/accessible/qaccessible.cpp') diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index 4758d1b5d4..757543281c 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -465,12 +465,10 @@ QAccessibleInterface::~QAccessibleInterface() /* accessible widgets plugin discovery stuff */ -#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QAccessibleFactoryInterface_iid, QLatin1String("/accessible"))) typedef QHash QAccessiblePluginsHash; Q_GLOBAL_STATIC(QAccessiblePluginsHash, qAccessiblePlugins) -#endif // FIXME turn this into one global static struct Q_GLOBAL_STATIC(QList, qAccessibleFactories) @@ -691,7 +689,6 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object) return iface; } } -#ifndef QT_NO_LIBRARY // Find a QAccessiblePlugin (factory) for the class name. If there's // no entry in the cache try to create it using the plugin loader. if (!qAccessiblePlugins()->contains(cn)) { @@ -713,7 +710,6 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object) } return result; } -#endif mo = mo->superClass(); } -- cgit v1.2.3