From f73b4ec3b6fec1705fda86abf5ffa62a1ecbfc02 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Sep 2018 23:20:06 +0900 Subject: [PATCH] LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro --- acinclude.m4 | 18 +++++++++--------- digikam/digikam/Makefile.am | 4 ++-- digikam/imageplugins/adjustcurves/Makefile.am | 2 +- digikam/imageplugins/adjustlevels/Makefile.am | 2 +- .../imageplugins/antivignetting/Makefile.am | 2 +- digikam/imageplugins/blurfx/Makefile.am | 2 +- digikam/imageplugins/border/Makefile.am | 2 +- digikam/imageplugins/channelmixer/Makefile.am | 2 +- digikam/imageplugins/charcoal/Makefile.am | 2 +- digikam/imageplugins/colorfx/Makefile.am | 2 +- digikam/imageplugins/coreplugin/Makefile.am | 2 +- digikam/imageplugins/distortionfx/Makefile.am | 2 +- digikam/imageplugins/emboss/Makefile.am | 2 +- digikam/imageplugins/filmgrain/Makefile.am | 2 +- digikam/imageplugins/freerotation/Makefile.am | 2 +- digikam/imageplugins/hotpixels/Makefile.am | 2 +- digikam/imageplugins/infrared/Makefile.am | 2 +- digikam/imageplugins/inpainting/Makefile.am | 2 +- digikam/imageplugins/inserttext/Makefile.am | 2 +- .../imageplugins/lensdistortion/Makefile.am | 2 +- .../imageplugins/noisereduction/Makefile.am | 2 +- digikam/imageplugins/oilpaint/Makefile.am | 2 +- digikam/imageplugins/perspective/Makefile.am | 2 +- digikam/imageplugins/raindrop/Makefile.am | 2 +- digikam/imageplugins/restoration/Makefile.am | 2 +- digikam/imageplugins/sheartool/Makefile.am | 2 +- digikam/imageplugins/superimpose/Makefile.am | 2 +- digikam/imageplugins/texture/Makefile.am | 2 +- digikam/imageplugins/whitebalance/Makefile.am | 2 +- digikam/libs/curves/Makefile.am | 2 +- digikam/libs/dialogs/Makefile.am | 4 ++-- digikam/libs/dimg/Makefile.am | 2 +- digikam/libs/dimg/filters/Makefile.am | 2 +- digikam/libs/dmetadata/Makefile.am | 2 +- digikam/libs/greycstoration/Makefile.am | 2 +- digikam/libs/histogram/Makefile.am | 2 +- digikam/libs/imageproperties/Makefile.am | 6 +++--- digikam/libs/jpegutils/Makefile.am | 2 +- digikam/libs/levels/Makefile.am | 2 +- digikam/libs/themeengine/Makefile.am | 2 +- digikam/libs/threadimageio/Makefile.am | 2 +- digikam/libs/thumbbar/Makefile.am | 2 +- digikam/libs/whitebalance/Makefile.am | 2 +- digikam/libs/widgets/Makefile.am | 2 +- digikam/libs/widgets/common/Makefile.am | 2 +- digikam/libs/widgets/iccprofiles/Makefile.am | 2 +- digikam/libs/widgets/imageplugins/Makefile.am | 2 +- digikam/libs/widgets/metadata/Makefile.am | 2 +- digikam/showfoto/setup/Makefile.am | 2 +- digikam/tdeioslave/Makefile.am | 10 +++++----- digikam/themedesigner/Makefile.am | 4 ++-- digikam/utilities/batch/Makefile.am | 2 +- digikam/utilities/cameragui/Makefile.am | 2 +- digikam/utilities/lighttable/Makefile.am | 2 +- digikam/utilities/setup/Makefile.am | 2 +- digikam/utilities/slideshow/Makefile.am | 2 +- 56 files changed, 73 insertions(+), 73 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index aa314d0..8fca7a0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1601,19 +1601,19 @@ AC_PATH_QT_MOC_UIC KDE_CHECK_QT_JPEG if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' else -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' fi -test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" +test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS" for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do if test -e "$a"; then - LIB_QT="$LIB_QT ${kde_int_qt}_incremental" + LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental" break fi done -AC_SUBST(LIB_QT) +AC_SUBST(LIB_TQT) AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) @@ -2125,7 +2125,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") @@ -5470,8 +5470,8 @@ AC_DEFUN([AC_PATH_QTOPIA], AC_MSG_CHECKING([for Qtopia]) - LIB_QTOPIA="-lqpe" - AC_SUBST(LIB_QTOPIA) + LIB_TQTOPIA="-lqpe" + AC_SUBST(LIB_TQTOPIA) kde_qtopia_dirs="$QPEDIR /opt/Qtopia" @@ -5518,7 +5518,7 @@ is required.]) CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_QTOPIA $LIBQT" + LIBS="$LIBS $LIB_TQTOPIA $LIBQT" cat > conftest.$ac_ext <