diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-10 22:00:11 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-10 22:00:11 (GMT) |
| commit | fd570dca1319cd92daf0f73b10ea4e090ea15c23 (patch) | |
| tree | 9de1035b83cd857340e30e82e781f80cd1abc6ef /src/corelib | |
| parent | 99e4ba7cb0700eb1a68d6db9fa8d058ddb59f233 (diff) | |
| parent | 3dc18b19ee2a02b93cc509a9162bf0a3900c6fd0 (diff) | |
| download | Qt-fd570dca1319cd92daf0f73b10ea4e090ea15c23.zip Qt-fd570dca1319cd92daf0f73b10ea4e090ea15c23.tar.gz Qt-fd570dca1319cd92daf0f73b10ea4e090ea15c23.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/plugin/qfactoryloader_p.h | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 62d565a..a26dcd8 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -244,6 +244,14 @@ QObject *QFactoryLoader::instance(const QString &key) const return 0; } +#ifdef Q_WS_X11 +QLibraryPrivate *QFactoryLoader::library(const QString &key) const +{ + Q_D(const QFactoryLoader); + return d->keyMap.value(d->cs ? key : key.toLower()); +} +#endif + void QFactoryLoader::refreshAll() { QMutexLocker locker(qt_factoryloader_mutex()); diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h index 10e6e2a..068c6c7 100644 --- a/src/corelib/plugin/qfactoryloader_p.h +++ b/src/corelib/plugin/qfactoryloader_p.h @@ -77,6 +77,10 @@ public: QStringList keys() const; QObject *instance(const QString &key) const; +#ifdef Q_WS_X11 + QLibraryPrivate *library(const QString &key) const; +#endif + void update(); static void refreshAll(); |