Win32: Add aqbanking-3.8.1 patch to fix a compiler error.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18090 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2009-05-27 13:49:25 +00:00
parent 443c5e177d
commit c83ad53c03
3 changed files with 18 additions and 0 deletions

View File

@ -0,0 +1,15 @@
diff --git a/src/frontends/qbanking/lib/dialogs/qbimporter.cpp b/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
index 630df18..c1061c6 100644
--- a/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
+++ b/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
@@ -850,7 +850,9 @@ bool QBImporter::_readFile(const QString &fname){
// conversion operator "QCString::operator const char * ()
// const" that will correctly convert the QCString to the
// const char*
- fd=open(fname.local8Bit().data(), O_RDONLY);
+ fd = ::open(fname.local8Bit().data(), O_RDONLY);
+ // Note: We need to write ::open() to avoid an ambiguity with
+ // QDialog::open().
if (fd==-1) {
qs=QWidget::tr("Could not open file \"%1\": %2")
.arg(fname)

View File

@ -274,6 +274,7 @@ if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz"
set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.1-patch.diff
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes

View File

@ -985,6 +985,8 @@ function inst_aqbanking() {
fi
if test x$AQBANKING_WITH_QT = xyes; then
inst_qt4
[ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] && \
patch -p1 < $AQBANKING_PATCH
./configure ${HOST_XCOMPILE} \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-xmlmerge=${XMLMERGE} \