onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2025-10-16 23:47:46 +02:00
Code Issues Releases Wiki Activity

fixing build problems on windows: added "-I .." to make #include work inside wizard subdirectories

Browse Source
This commit is contained in:
Vadim Kurland 2011-03-01 21:11:58 -08:00
parent 485a681bb0
commit a164655216
16 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
# build number is like "nano" version number. I am incrementing build
# number during development cycle
#
BUILD_NUM="3491"
BUILD_NUM="3492"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

2
VERSION.h
View File

@ -1,2 +1,2 @@
#define VERSION "4.2.0.3491"
#define VERSION "4.2.0.3492"
#define GENERATION "4.2"

2
packaging/fwbuilder-static-qt.spec
View File

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 4.2.0.3491
%define version 4.2.0.3492
%define release 1
%if "%_vendor" == "MandrakeSoft"

2
packaging/fwbuilder.control
View File

@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra
Section: checkinstall
Maintainer: vadim@fwbuilder.org
Version: 4.2.0.3491-1
Version: 4.2.0.3492-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

@ -1,6 +1,6 @@
%define name fwbuilder
%define version 4.2.0.3491
%define version 4.2.0.3492
%define release 1
%if "%_vendor" == "MandrakeSoft"

8
src/libgui/importAddressListWizard/ChooseObjectsPage.cpp
View File

@ -21,14 +21,14 @@
*/
#include "../../../config.h"
#include "../global.h"
#include "../../config.h"
#include "global.h"
#include "ChooseObjectsPage.h"
#include "HostsFile.h"
#include "../ObjectDescriptor.h"
#include "../FilterDialog.h"
#include "ObjectDescriptor.h"
#include "FilterDialog.h"
#include <QProgressDialog>
#include <QMessageBox>

1
src/libgui/importAddressListWizard/ChooseObjectsPage.h
View File

@ -24,7 +24,6 @@
#ifndef __CHOOSEOBJECTSPAGE_H_
#define __CHOOSEOBJECTSPAGE_H_
//#include "../../config.h"
#include "ui_chooseobjectspage_q.h"
#include "fwbuilder/InetAddr.h"

10
src/libgui/importAddressListWizard/CreateObjectsPage.cpp
View File

@ -21,11 +21,11 @@
*/
#include "../../../config.h"
#include "../global.h"
#include "../events.h"
#include "../FWWindow.h"
#include "../ProjectPanel.h"
#include "../../config.h"
#include "global.h"
#include "events.h"
#include "FWWindow.h"
#include "ProjectPanel.h"
#include "CreateObjectsPage.h"

1
src/libgui/importAddressListWizard/CreateObjectsPage.h
View File

@ -24,7 +24,6 @@
#ifndef __CREATEOBJECTSPAGE_H_
#define __CREATEOBJECTSPAGE_H_
//#include "../../config.h"
#include "ui_createobjectspage_q.h"

6
src/libgui/importAddressListWizard/FileNamePage.cpp
View File

@ -21,9 +21,9 @@
*/
#include "../../../config.h"
#include "../global.h"
#include "../FWBSettings.h"
#include "../../config.h"
#include "global.h"
#include "FWBSettings.h"
#include "FileNamePage.h"

1
src/libgui/importAddressListWizard/FileNamePage.h
View File

@ -24,7 +24,6 @@
#ifndef __FILENAMEPAGE_H_
#define __FILENAMEPAGE_H_
//#include "../../config.h"
#include "ui_filenamepage_q.h"

3
src/libgui/importAddressListWizard/ImportAddressListWizard.cpp
View File

@ -21,8 +21,7 @@
*/
//#include "../../../config.h"
#include "../global.h"
#include "global.h"
#include "ImportAddressListWizard.h"
#include "FileNamePage.h"

2
src/libgui/importAddressListWizard/ImportAddressListWizard.h
View File

@ -24,8 +24,6 @@
#ifndef __IMPORTADDRESSLISTWIZARD_H_
#define __IMPORTADDRESSLISTWIZARD_H_
//#include "../../config.h"
#include <QWizard>

7
src/libgui/importAddressListWizard/SelectLibraryPage.cpp
View File

@ -21,10 +21,9 @@
*/
//#include "../../config.h"
#include "../global.h"
#include "../utils.h"
#include "../FWWindow.h"
#include "global.h"
#include "utils.h"
#include "FWWindow.h"
#include "SelectLibraryPage.h"

1
src/libgui/importAddressListWizard/SelectLibraryPage.h
View File

@ -24,7 +24,6 @@
#ifndef __SELECTLIBRARYPAGE_H_
#define __SELECTLIBRARYPAGE_H_
//#include "../../config.h"
#include "ui_selectlibrarypage_q.h"

4
src/libgui/libgui.pro
View File

@ -518,6 +518,10 @@ FORMS += transferdialog_q.ui
INCLUDEPATH += $$ANTLR_INCLUDEPATH
DEFINES += $$ANTLR_DEFINES
# add ".." to includepath to make sure #include works when we compile modules
# in subdirectories, such as importAddressListWizard and other wizards
INCLUDEPATH += ..
# !macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
INCLUDEPATH += ../common \
../iptlib \