From 1a572019fea761157e214299355f8dbaee7c183f Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sun, 8 Mar 2015 13:11:47 +0100 Subject: [PATCH] Revert "[Qt translations] create the .qm files during the build" This reverts commit 7d01a84d0e2833f685b7e70c3a52097891286566. cmake doesn't get the dependencies right if the .qm files are gone I'll work on this off-line and resubmit it as one commit rather than trying to approach this step-by-step Change-Id: Ibbd60163f910adbd571b3df2a980d64dbf1ea924 Reviewed-on: https://code.wireshark.org/review/7596 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser --- configure.ac | 23 ----------------------- ui/qt/Makefile.am | 16 ---------------- 2 files changed, 39 deletions(-) diff --git a/configure.ac b/configure.ac index 11e90e0c5f..06a3d890d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1877,29 +1877,6 @@ then fi AC_SUBST(RCC) -AC_PATH_PROG(LRELEASE, lrelease) -if test "x$LRELEASE" = x; then - AC_PATH_PROG(LRELEASE, lrelease-qt5) - if test "x$LRELEASE" = x; then - AC_PATH_PROG(LRELEASE, lrelease-qt4) - fi -fi -# Debian/Ubuntu ship a package qtchooser that installs placeholders for -# the Qt tools like lrelease - check if the lrelease that we found is -# really the one that's part of Qt linguist -if (test "x$LRELEASE" != x) ; then - AC_MSG_CHECKING([if $LRELEASE is usable]) - if (sh -c $LRELEASE -help 2> /dev/null | grep -i linguist 2>&1 > /dev/null ) ; then - AC_MSG_RESULT(yes) - have_lrelease="yes" - AC_SUBST(LRELEASE) - else - AC_MSG_RESULT(no) - have_lrelease="no" - fi -fi -AM_CONDITIONAL(HAVE_LRELEASE, test "x$have_lrelease" = "xyes") - # Error out if a glib header other than a "top level" header # (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h) # is used. diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index 169573349e..7a0bd9ed2a 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -228,22 +228,6 @@ uat_dialog.cpp uat_dialog.h: ui_uat_dialog.h voip_calls_dialog.cpp voip_calls_dialog.h: ui_voip_calls_dialog.h - -# -# translation files -# - -if HAVE_LRELEASE -AM_V_LRELEASE = $(am__v_LRELEASE_@AM_V@) -am__v_LRELEASE_ = $(am__v_LRELEASE_@AM_DEFAULT_V@) -am__v_LRELEASE_0 = @echo " LRELEASE " $@; - -%.qm: %.ts - $(AM_V_LRELEASE)$(LRELEASE) -silent $< - -dist_pkgdata_DATA = $(QM_FILES) -endif # HAVE_LRELEASE - doxygen: if HAVE_DOXYGEN $(DOXYGEN) doxygen.cfg