building on CentOS5.2 Using "CONFIG += dbus" in .pro files including configure test; workaround breaks on centos and is hard to fix and maintain. If CONFIG construct does not work on some old Linuxes , then there will be no fwbtransfer support

build_num

@@ -1 +1 @@
-#define BUILD_NUM 1819
+#define BUILD_NUM 1820

config_tests/qtdbus_test.pro

@@ -1,13 +1,10 @@
 # -*- mode: makefile; tab-width: 4; -*-
 TEMPLATE = app
+
 unix {
-  macx {
+	!macx: QT += network dbus
-      LIBS += -framework QtDBus
+	macx:  LIBS += -framework QtDBus
-  }
-  !macx {
-      # workaround for QT += dbus not working atm
-      LIBS += -lQtDBus
-  }
 }
+
 SOURCES = qtdbus_test.cpp
 TARGET = qtdbus_test

src/gui/ProjectPanel_events.cpp

@@ -115,12 +115,14 @@ bool ProjectPanel::event(QEvent *event)
                 return true;
 
             case OBJECT_NAME_CHANGED_EVENT:
+            {
                 objectNameChangedEvent *name_change_event =
                     dynamic_cast<objectNameChangedEvent*>(event);
                 // This performs automatic renaming of child objects if necessary
                 m_panel->om->updateObjName(obj, name_change_event->old_name, true);
                 ev->accept();
                 return true;
+            }
 
             case UPDATE_LAST_COMPILED_TIMESTAMP_EVENT:
                 if (Firewall::cast(obj))

src/gui/gui.pro

@@ -4,16 +4,10 @@ TEMPLATE = app
 LANGUAGE = C++
 QT += network
 
-# this should work, but it does not with 4.3.5, workaround below
-# QT += network dbus
 TARGET = fwbuilder
 include(../../qmake.inc)
 exists(qmake.inc):include( qmake.inc)
-contains( HAVE_QTDBUS, 1 ):unix { 
+
-    macx:LIBS += -framework \
-        QtDBus
-    !macx:LIBS += -lQtDBus # workaround for QT += dbus not working atm
-}
 
 # This makes gcc compile this header file and store result in
 # .obj/fwbuilder.gch/c++. Generated Makefile will also add
@@ -425,18 +419,28 @@ FORMS = FWBMainWindow_q.ui \
     InterfaceEditorWidget.ui \
     InterfacesTabWidget.ui
 
-# fwtransfer stuff
+# fwtransfer stuff.
 HEADERS += transferDialog.h
 SOURCES += transferDialog.cpp
 FORMS += transferdialog_q.ui
+
 contains( HAVE_ANTLR_RUNTIME, 1 ) { 
     INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    LIBS += $$FWBPARSER_LIB \
+    LIBS += $$FWBPARSER_LIB $$ANTLR_LIBS
-        $$ANTLR_LIBS \
-        $$FWTRANSFER_LIB
     DEFINES += $$ANTLR_DEFINES
 }
 LIBS += $$LIBS_FWCOMPILER
+
+# fwtransfer lib. Add this before adding -lQtDBus to LIBS below
+LIBS += $$FWTRANSFER_LIB
+
+contains( HAVE_QTDBUS, 1 ):unix {
+	!macx: QT += network dbus
+	macx:  LIBS += -framework QtDBus
+#!macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
+}
+
+
 INCLUDEPATH += ../iptlib \
     ../pflib \
     ../cisco_lib/ \

src/transfer_agents/secuwall/secuwall.pro

@@ -7,16 +7,10 @@ SOURCES = transfer_secuwall.cpp
 
 HEADERS = ../../../config.h
 
-contains( HAVE_QTDBUS, 1 ) { 
+contains( HAVE_QTDBUS, 1 ):unix {
-  unix {
+	!macx: QT += network dbus
-    macx {
+	macx:  LIBS += -framework QtDBus
-        LIBS += -framework QtDBus
+#!macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
-    }
-    !macx {
-        # workaround for QT += dbus not working atm
-        LIBS += -lQtDBus
-    }
-  }
 }
 
 !win32 {