LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/4/head
Michele Calgaro 6 years ago
parent ab182361e7
commit 6684ee8276
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1577,19 +1577,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)
@ -2101,7 +2101,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)")
@ -5442,8 +5442,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"
@ -5490,7 +5490,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 <<EOF
#include "confdefs.h"

@ -27,8 +27,8 @@ kerry_la_SOURCES = main.cpp beaglesearch.cpp kerryapp.cpp searchdlg.cpp searchdl
hitwidget_layout.ui hitwidget.cpp kwidgetlistbox.cpp \
dcopinterface.skel dcopinterface.stub kerrylabel.cpp query.cpp
kerry_la_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(GLIB_LDFLAGS) $(LIBBEAGLE_LDFLAGS) $(LIB_QT)
kerry_la_LIBADD = -ltdeio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_TDEABC) -lDCOP $(LIB_QT) $(LIB_TDECORE)
kerry_la_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(GLIB_LDFLAGS) $(LIBBEAGLE_LDFLAGS) $(LIB_TQT)
kerry_la_LIBADD = -ltdeio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_TDEABC) -lDCOP $(LIB_TQT) $(LIB_TDECORE)
autostartdir = $(datadir)/autostart
autostart_DATA = kerry.autostart.desktop beagled.desktop

@ -9,7 +9,7 @@ kcm_beagle_la_SOURCES = main.cpp beagle.cpp kerry.cpp indexing.cpp backends.cpp
select_privacy_resource.ui
kcm_beagle_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_beagle_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIBBEAGLE_LIBADD) $(LIB_QT) $(LIB_TDECORE) -lDCOP
kcm_beagle_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIBBEAGLE_LIBADD) $(LIB_TQT) $(LIB_TDECORE) -lDCOP
xdg_apps_DATA = kcmbeagle.desktop

Loading…
Cancel
Save