diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/src/multimedia/qmediapluginloader.cpp --- a/qtmobility/src/multimedia/qmediapluginloader.cpp Fri Apr 16 15:51:22 2010 +0300 +++ b/qtmobility/src/multimedia/qmediapluginloader.cpp Mon May 03 13:18:40 2010 +0300 @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include +#include "qmediapluginloader_p.h" #include #include #include #include -#include +#include "qmediaserviceproviderplugin.h" QTM_BEGIN_NAMESPACE @@ -87,7 +87,6 @@ return; if (staticMediaPlugins() && staticMediaPlugins()->contains(m_location)) { - qWarning() << "Load static plugins for" << m_location; foreach(QObject *o, staticMediaPlugins()->value(m_location)) { if (o != 0 && o->qt_metacast(m_iid) != 0) { QFactoryInterface* p = qobject_cast(o); @@ -100,6 +99,10 @@ } else { QStringList paths = QCoreApplication::libraryPaths(); +#ifdef QTM_PLUGIN_PATH + paths << QTM_PLUGIN_PATH; +#endif + foreach (QString const &path, paths) { QString pluginPathName(path + m_location); QDir pluginDir(pluginPathName);