fixed automatic qt-plugins prefix patch

master
Marc Wäckerlin 9 years ago
parent 0117916b4b
commit 069a44e35e
  1. 4
      ax_check_qt.m4
  2. 8
      src/languages.qrc

@ -198,7 +198,8 @@ AC_DEFUN([AX_CHECK_QT], [
if test -n "${MINGW}"; then if test -n "${MINGW}"; then
AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag]) AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag])
fi fi
if test "$prefix" != '/usr' -a "${QT_PLUGIN_PATH}" != "${QT_PLUGIN_PATH#/usr}"; then test "x$prefix" = xNONE && prefix=$ac_default_prefix
if test "${QT_PLUGIN_PATH}" = "${QT_PLUGIN_PATH#${prefix}}"; then
QT_PLUGIN_PATH=${prefix}${QT_PLUGIN_PATH#/usr} QT_PLUGIN_PATH=${prefix}${QT_PLUGIN_PATH#/usr}
fi fi
AC_ARG_WITH([qt-plugin-path], AC_ARG_WITH([qt-plugin-path],
@ -206,6 +207,7 @@ AC_DEFUN([AX_CHECK_QT], [
[define a different qt plugin path, current @<:@default=check@:>@])], [define a different qt plugin path, current @<:@default=check@:>@])],
[QT_PLUGIN_PATH=$with_qt_plugin_path], [QT_PLUGIN_PATH=$with_qt_plugin_path],
[]) [])
AC_MSG_NOTICE([Qt Plugins are installed to ${QT_PLUGIN_PATH}])
AC_SUBST(QTDIR) AC_SUBST(QTDIR)
AC_SUBST(QT_PLUGIN_PATH) AC_SUBST(QT_PLUGIN_PATH)
AC_SUBST(CPPFLAGS) AC_SUBST(CPPFLAGS)

@ -1,8 +0,0 @@
<RCC>
<qresource prefix="/language">
<file>swisssurfer_de.qm</file>
<file>swisssurfer_fr.qm</file>
<file>swisssurfer_it.qm</file>
<file>swisssurfer_en.qm</file>
</qresource>
</RCC>
Loading…
Cancel
Save