don't stop if qt is not found; more elegant way for adding qt rules
This commit is contained in:
33
ChangeLog
33
ChangeLog
@@ -1,3 +1,36 @@
|
|||||||
|
2015-03-05 13:21 marc
|
||||||
|
|
||||||
|
* m4/ax_check_qt.m4, src/makefile.am: don't stop if qt is not
|
||||||
|
found; more elegant way for adding qt rules
|
||||||
|
|
||||||
|
2015-03-05 12:02 marc
|
||||||
|
|
||||||
|
* ChangeLog, m4/ax_check_qt.m4: qt tools are optional
|
||||||
|
|
||||||
|
2015-03-05 09:05 marc
|
||||||
|
|
||||||
|
* configure.ac: support Qt4 which has no QWidgets - but Qt5 needs
|
||||||
|
it
|
||||||
|
|
||||||
|
2015-03-05 08:34 marc
|
||||||
|
|
||||||
|
* configure.ac: support Qt4 which has no QWidgets
|
||||||
|
|
||||||
|
2015-03-04 14:59 marc
|
||||||
|
|
||||||
|
* debian/control.in, doc/doxyfile.in: strange error «sh: 1:
|
||||||
|
/usr/bindot: not found; on squeeze, there's no qt5»
|
||||||
|
|
||||||
|
2015-03-04 14:44 marc
|
||||||
|
|
||||||
|
* configure.ac: fix «HAVE_QTNETWORK does not appear in
|
||||||
|
AM_CONDITIONAL» when there is no qt
|
||||||
|
|
||||||
|
2015-03-04 14:40 marc
|
||||||
|
|
||||||
|
* configure.ac, m4/ax_check_qt.m4: fix «HAVE_QTNETWORK does not
|
||||||
|
appear in AM_CONDITIONAL» when there is no qt
|
||||||
|
|
||||||
2015-03-04 13:28 marc
|
2015-03-04 13:28 marc
|
||||||
|
|
||||||
* m4/ax_check_qt.m4: try to fix «HAVE_QTNETWORK does not appear in
|
* m4/ax_check_qt.m4: try to fix «HAVE_QTNETWORK does not appear in
|
||||||
|
@@ -84,11 +84,11 @@ AC_DEFUN([AX_CXX_CHECK_QT], [
|
|||||||
AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
|
AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
|
||||||
AC_SUBST(AM_CPPFLAGS)
|
AC_SUBST(AM_CPPFLAGS)
|
||||||
AC_SUBST(AM_CXXFLAGS)
|
AC_SUBST(AM_CXXFLAGS)
|
||||||
ADDITIONAL_QT_RULES='
|
AX_ADDITIONAL_QT_RULES_HACK='
|
||||||
%_ui.hxx: %.ui
|
%_ui.hxx: %.ui
|
||||||
${UIC} -o [$][@] $<
|
${UIC} -o [$][@] $<
|
||||||
|
|
||||||
moc_%.cxx: %.hxx
|
moc_%.cxx: %.hxx
|
||||||
${MOC} -o [$][@] $<'
|
${MOC} -o [$][@] $<'
|
||||||
AC_SUBST(QT_RULES)
|
AC_SUBST(AX_ADDITIONAL_QT_RULES_HACK)
|
||||||
])
|
])
|
||||||
|
Reference in New Issue
Block a user