Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14687 => 14688)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-31 04:01:40 UTC (rev 14687)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-31 04:07:04 UTC (rev 14688)
@@ -130,10 +130,18 @@
{
pluginsDir = new QDir;
QSettings settings;
+#if defined(FSGUI_PLUGINDIR)
QString dir = settings.value("PluginDir", FSGUI_PLUGINDIR).toString();
pluginsDir->setCurrent(dir);
+#else
+ QString dir = settings.value("PluginDir", qApp->applicationDirPath()).toString();
+ qDebug() << qApp->applicationDirPath();
+ pluginsDir->setCurrent(dir);
+ pluginsDir->cd("plugins");
+#endif
+
#if defined(Q_OS_MAC)
- dir = qApp->applicationDirPath();
+ QString dir = qApp->applicationDirPath();
pluginsDir->setCurrent(dir);
pluginsDir->cd("../PlugIns/fsgui/");
#endif
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro (14687 => 14688)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro 2009-08-31 04:01:40 UTC (rev 14687)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro 2009-08-31 04:07:04 UTC (rev 14688)
@@ -27,10 +27,9 @@
# Let user change the plugin location
# upon compilation
#####################################
-isEmpty ( PLUGINDIR ) {
- PLUGINDIR = $${PWD}/../../bin/plugins
+!isEmpty ( PLUGINDIR ) {
+ DEFINES += FSGUI_PLUGINDIR='\\"$${PLUGINDIR}\\"'
}
-DEFINES += FSGUI_PLUGINDIR='\\"$${PLUGINDIR}\\"'
######################################
macx:ICON=../resources/mac_icon.icns