tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix small cc glitches: qt3.1, xapian-config

Browse Source
This commit is contained in:
dockes 2006-02-02 08:35:18 +00:00
parent f876823967
commit e809917cf6
6 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.in
View File

@ -1,4 +1,4 @@
# @(#$Id: Makefile.in,v 1.2 2006-01-21 15:36:05 dockes Exp $ (C) 2005 J.F.Dockes # @(#$Id: Makefile.in,v 1.3 2006-02-02 08:35:17 dockes Exp $ (C) 2005 J.F.Dockes
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -43,6 +43,7 @@ clean:
distclean: clean distclean: clean
rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf \ rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf \
qtgui/recoll.pro Makefile \
recollinstall \ recollinstall \
doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest

2
src/VERSION
View File

@ -1 +1 @@
1.2.1 1.2.2

15
src/configure vendored
View File

@ -2183,11 +2183,20 @@ xapian-core installed ?" >&2;}
exit 1 exit 1
fi fi
LIBXAPIAN=`$XAPIAN_CONFIG --libs` LIBXAPIAN=`$XAPIAN_CONFIG --libs`
# Workaround for problem in xapian-config in some versions: wrongly lists
# libstdc++.la in the lib list
for i in $LIBXAPIAN ; do
case $i in
*libstdc++.la);;
*) tmpxaplib="$tmpxaplib $i";;
esac
done
LIBXAPIAN=$tmpxaplib
XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags` XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
#echo XAPIAN_CONFIG $XAPIAN_CONFIG #echo XAPIAN_CONFIG: $XAPIAN_CONFIG
#echo LIBXAPIAN $LIBXAPIAN #echo LIBXAPIAN: $LIBXAPIAN
#echo XAPIANCXXFLAGS $XAPIANCXXFLAGS #echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS
#### QT #### QT
# The way qt and its tools (qmake especially) are installed is very # The way qt and its tools (qmake especially) are installed is very

15
src/configure.ac
View File

@ -54,11 +54,20 @@ xapian-core installed ?])
exit 1 exit 1
fi fi
LIBXAPIAN=`$XAPIAN_CONFIG --libs` LIBXAPIAN=`$XAPIAN_CONFIG --libs`
# Workaround for problem in xapian-config in some versions: wrongly lists
# libstdc++.la in the lib list
for i in $LIBXAPIAN ; do
case $i in
*libstdc++.la);;
*) tmpxaplib="$tmpxaplib $i";;
esac
done
LIBXAPIAN=$tmpxaplib
XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags` XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
#echo XAPIAN_CONFIG $XAPIAN_CONFIG #echo XAPIAN_CONFIG: $XAPIAN_CONFIG
#echo LIBXAPIAN $LIBXAPIAN #echo LIBXAPIAN: $LIBXAPIAN
#echo XAPIANCXXFLAGS $XAPIANCXXFLAGS #echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS
#### QT #### QT
# The way qt and its tools (qmake especially) are installed is very # The way qt and its tools (qmake especially) are installed is very

10
src/qtgui/main.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: main.cpp,v 1.36 2006-01-30 09:28:50 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: main.cpp,v 1.37 2006-02-02 08:35:18 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -211,8 +211,14 @@ int main( int argc, char ** argv )
if (!maybeOpenDb(reason)) { if (!maybeOpenDb(reason)) {
startindexing = 1; startindexing = 1;
switch (QMessageBox:: switch (QMessageBox::
question(0, "Recoll", #if (QT_VERSION < 0x030200)
question
#else
information
#endif
(0, "Recoll",
app.translate("Main", "Could not open database in ")+ app.translate("Main", "Could not open database in ")+
QString(dbdir) + QString(dbdir) +
app.translate("Main", app.translate("Main",

4
src/qtgui/preview/preview.ui.h
View File

@ -47,6 +47,10 @@ using std::pair;
#include "wipedir.h" #include "wipedir.h"
#include "cancelcheck.h" #include "cancelcheck.h"
#if (QT_VERSION < 0x030300)
#define wasCanceled wasCancelled
#endif
// We keep a list of data associated to each tab // We keep a list of data associated to each tab
class TabData { class TabData {
public: public: