--- a/qtmobility/src/multimedia/qmediapluginloader.cpp Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediapluginloader.cpp Fri May 14 16:41:33 2010 +0300
@@ -39,6 +39,7 @@
**
****************************************************************************/
+#include <src/global/qbuildcfg.h>
#include "qmediapluginloader_p.h"
#include <QtCore/qcoreapplication.h>
#include <QtCore/qpluginloader.h>
@@ -47,7 +48,7 @@
#include "qmediaserviceproviderplugin.h"
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
typedef QMap<QString,QObjectList> ObjectListMap;
@@ -98,6 +99,12 @@
}
} else {
QStringList paths = QCoreApplication::libraryPaths();
+ QString val = qt_mobility_configure_prefix_path_str;
+ if(val.length() > 0){
+ val += "/plugins";
+ paths << val;
+ }
+
#ifdef QTM_PLUGIN_PATH
paths << QTM_PLUGIN_PATH;
@@ -131,5 +138,5 @@
}
}
}
-QTM_END_NAMESPACE
+QT_END_NAMESPACE