Diff
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14514 => 14515)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-14 02:40:48 UTC (rev 14514)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-14 04:40:08 UTC (rev 14515)
@@ -6,6 +6,9 @@
#include "appmanager.h"
#include "interfaces.h"
#include "ui_config_plugin_widget.h"
+#if defined(Q_OS_WIN)
+#include "switch_version.h"
+#endif
AppManager::AppManager(QObject *parent)
: QObject(parent)
@@ -241,7 +244,13 @@
void AppManager::about()
{
+#if defined(Q_OS_WIN)
QMessageBox::about(qobject_cast<QMainWindow *>(list_available_monitor_plugins.first()->_loader->instance()),
tr("About FsGui"),
+ tr("Compiled with FreeSWITCH version: %1").arg(SWITCH_VERSION_FULL));
+#else
+ QMessageBox::about(qobject_cast<QMainWindow *>(list_available_monitor_plugins.first()->_loader->instance()),
+ tr("About FsGui"),
tr("Version: %1").arg(FSGUI_SVN_VERSION));
+#endif
}
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro (14514 => 14515)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro 2009-08-14 02:40:48 UTC (rev 14514)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro 2009-08-14 04:40:08 UTC (rev 14515)
@@ -11,11 +11,16 @@
# Generates the version of FsGui
# based on SVN Revision
#####################################
-SVN_REV = $$system(svnversion -n .)
-isEmpty ( SVN_REV ) {
-SVN_REV = \\"Unknown or SVN not present\\"
+!win32 {
+ SVN_REV = $$system(svnversion -n .)
+ isEmpty ( SVN_REV ) {
+ SVN_REV = \\"Unknown or SVN not present\\"
+ }
+ DEFINES += 'FSGUI_SVN_VERSION=\\"$$SVN_REV\\"'
}
-DEFINES += 'FSGUI_SVN_VERSION=\\"$$SVN_REV\\"'
+win32 {
+ INCLUDEPATH += ../../../../../src/include/
+}
######################################
#####################################
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.pro (14514 => 14515)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.pro 2009-08-14 02:40:48 UTC (rev 14514)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.pro 2009-08-14 04:40:08 UTC (rev 14515)
@@ -11,18 +11,25 @@
# Generates the version of FsGui
# based on SVN Revision
#####################################
-SVN_REV = $$system(svnversion -n .)
-isEmpty ( SVN_REV ) {
+!win32 {
+ SVN_REV = $$system(svnversion -n .)
+ isEmpty ( SVN_REV ) {
SVN_REV = \\"Unknown or SVN not present\\"
+ }
+ DEFINES += 'FSGUI_SVN_VERSION=\\"$$SVN_REV\\"'
}
-DEFINES += 'FSGUI_SVN_VERSION=\\"$$SVN_REV\\"'
+win32 {
+ INCLUDEPATH += ../../../../../src/include/
+}
######################################
#####################################
# ESL must be compiled
#####################################
-!exists ( ../../../../../libs/esl/libesl.a ) {
- error("lib esl must be compiled before FsGui")
+!win32 {
+ !exists ( ../../../../../libs/esl/libesl.a ) {
+ error("lib esl must be compiled before FsGui")
+ }
}
#####################################
@@ -30,7 +37,7 @@
TEMPLATE = lib
CONFIG += staticlib
VERSION = 0.1
-INCLUDEPATH = ../fsgui/ \
+INCLUDEPATH += ../fsgui/ \
../../../../../libs/esl/src/include/
HEADERS = interfaces.h \
settingsdialog.h \
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro (14514 => 14515)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro 2009-08-14 02:40:48 UTC (rev 14514)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro 2009-08-14 04:40:08 UTC (rev 14515)
@@ -11,11 +11,16 @@
# Generates the version of FsGui
# based on SVN Revision
#####################################
-SVN_REV = $$system(svnversion -n .)
-isEmpty ( SVN_REV ) {
-SVN_REV = \\"Unknown or SVN not present\\"
+!win32 {
+ SVN_REV = $$system(svnversion -n .)
+ isEmpty ( SVN_REV ) {
+ SVN_REV = \\"Unknown or SVN not present\\"
+ }
+ DEFINES += 'FSGUI_SVN_VERSION=\\"$$SVN_REV\\"'
}
-DEFINES += 'FSGUI_SVN_VERSION=\\"$$SVN_REV\\"'
+win32 {
+ INCLUDEPATH += ../../../../../src/include/
+}
######################################
TEMPLATE = lib