fixes for freebsd

This commit is contained in:
Vadim Kurland
2008-09-01 07:40:48 +00:00
parent ef90933d10
commit 1c608b5a89
4 changed files with 41 additions and 25 deletions
+8
View File
@@ -1,3 +1,11 @@
2008-09-01 Vadim Kurland <vadim@vk.crocodile.org>
* res.pro: Do not try to install icons if variable ICONSDIR was
not defined by configure. This is the case on FreeBSD, I do not
know where application icons should be installed there.
* ActionsDialog.cpp: more fixes for compile problems on FreeBSD
2008-08-31 Vadim Kurland <vadim@vk.crocodile.org>
* ObjectTreeViewItem.cpp: more fixes for compile problems on
+1
View File
@@ -37,6 +37,7 @@
#include "fwbuilder/Interface.h"
#include "fwbuilder/FWException.h"
#include "fwbuilder/Rule.h"
#include "fwbuilder/RuleSet.h"
#include "fwbuilder/Firewall.h"
#include <qlineedit.h>
+6
View File
@@ -26,6 +26,12 @@
#include "AskLibForCopyDialog.h"
#include "FWBSettings.h"
#include "fwbuilder/FWObject.h"
#include "fwbuilder/FWObjectDatabase.h"
#include "fwbuilder/Library.h"
#include <qpixmapcache.h>
using namespace std;
using namespace libfwbuilder;
+26 -25
View File
@@ -41,38 +41,39 @@ unix {
res_desktop.files = fwbuilder.desktop
INSTALLS += res_desktop
app_icon_16x16.files = Icons/16x16/fwbuilder.png
app_icon_16x16.path = $$ICONSDIR/16x16/apps
INSTALLS += app_icon_16x16
!isEmpty(ICONSDIR) {
app_icon_16x16.files = Icons/16x16/fwbuilder.png
app_icon_16x16.path = $$ICONSDIR/16x16/apps
INSTALLS += app_icon_16x16
app_icon_24x24.files = Icons/24x24/fwbuilder.png
app_icon_24x24.path = $$ICONSDIR/24x24/apps
INSTALLS += app_icon_24x24
app_icon_24x24.files = Icons/24x24/fwbuilder.png
app_icon_24x24.path = $$ICONSDIR/24x24/apps
INSTALLS += app_icon_24x24
app_icon_32x32.files = Icons/32x32/fwbuilder.png
app_icon_32x32.path = $$ICONSDIR/32x32/apps
INSTALLS += app_icon_32x32
app_icon_32x32.files = Icons/32x32/fwbuilder.png
app_icon_32x32.path = $$ICONSDIR/32x32/apps
INSTALLS += app_icon_32x32
app_icon_48x48.files = Icons/48x48/fwbuilder.png
app_icon_48x48.path = $$ICONSDIR/48x48/apps
INSTALLS += app_icon_48x48
app_icon_48x48.files = Icons/48x48/fwbuilder.png
app_icon_48x48.path = $$ICONSDIR/48x48/apps
INSTALLS += app_icon_48x48
app_icon_72x72.files = Icons/72x72/fwbuilder.png
app_icon_72x72.path = $$ICONSDIR/72x72/apps
INSTALLS += app_icon_72x72
app_icon_72x72.files = Icons/72x72/fwbuilder.png
app_icon_72x72.path = $$ICONSDIR/72x72/apps
INSTALLS += app_icon_72x72
app_icon_128x128.files = Icons/128x128/fwbuilder.png
app_icon_128x128.path = $$ICONSDIR/128x128/apps
INSTALLS += app_icon_128x128
app_icon_128x128.files = Icons/128x128/fwbuilder.png
app_icon_128x128.path = $$ICONSDIR/128x128/apps
INSTALLS += app_icon_128x128
app_icon_256x256.files = Icons/256x256/fwbuilder.png
app_icon_256x256.path = $$ICONSDIR/256x256/apps
INSTALLS += app_icon_256x256
app_icon_512x512.files = Icons/512x512/fwbuilder.png
app_icon_512x512.path = $$ICONSDIR/512x512/apps
INSTALLS += app_icon_512x512
app_icon_256x256.files = Icons/256x256/fwbuilder.png
app_icon_256x256.path = $$ICONSDIR/256x256/apps
INSTALLS += app_icon_256x256
app_icon_512x512.files = Icons/512x512/fwbuilder.png
app_icon_512x512.path = $$ICONSDIR/512x512/apps
INSTALLS += app_icon_512x512
}
}
}