TDE
/
kshowmail
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kshowmail
0
0
Fork 0
Code Issues Releases Wiki Activity

LIB_QT -> LIB_TQT conversion to align to updated admin module

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent 10d3b7990d
commit be66d0afa5
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

18
acinclude.m4
Unescape View File

@ -1577,19 +1577,19 @@ AC_PATH_QT_MOC_UIC
KDE_CHECK_QT_JPEG KDE_CHECK_QT_JPEG
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then 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 else
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
fi 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 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then if test -e "$a"; then
LIB_QT="$LIB_QT ${kde_int_qt}_incremental" LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
break break
fi fi
done done
AC_SUBST(LIB_QT) AC_SUBST(LIB_TQT)
AC_SUBST(LIB_QPE) AC_SUBST(LIB_QPE)
AC_SUBST(kde_qtver) AC_SUBST(kde_qtver)
@ -2101,7 +2101,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else 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_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@ -5443,8 +5443,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
AC_MSG_CHECKING([for Qtopia]) AC_MSG_CHECKING([for Qtopia])
LIB_QTOPIA="-lqpe" LIB_TQTOPIA="-lqpe"
AC_SUBST(LIB_QTOPIA) AC_SUBST(LIB_TQTOPIA)
kde_qtopia_dirs="$QPEDIR /opt/Qtopia" kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
@ -5491,7 +5491,7 @@ is required.])
CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" 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 cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"

2
kshowmail/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ kshowmail_SOURCES = AlertDlg.ui alertdialog.cpp configelem.cpp configlist.cpp \
showmaildialog.cpp showrecord.cpp showrecordelem.cpp uniqueapp.cpp filterlogview.cpp \ showmaildialog.cpp showrecord.cpp showrecordelem.cpp uniqueapp.cpp filterlogview.cpp \
filterlogviewdeleteditem.cpp filterlogviewmoveditem.cpp filterlogviewdeleteditem.cpp filterlogviewmoveditem.cpp
kshowmail_LDADD = $(LIB_TDEUTILS) -lmimelib $(LIB_KFILE) $(LIB_TDEUI) \ kshowmail_LDADD = $(LIB_TDEUTILS) -lmimelib $(LIB_KFILE) $(LIB_TDEUI) \
$(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT) $(LIBSOCKET) -ltdewalletclient -lDCOP $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT) $(LIBSOCKET) -ltdewalletclient -lDCOP
EXTRA_DIST = main.cpp kshowmail.cpp kshowmail.h kshowmaildoc.cpp kshowmaildoc.h commandentry.cpp commandentry.h kshowmailview.cpp kshowmailview.h OptionDlg.ui OptionDlg.h optiondialog.cpp optiondialog.h ServerDlg.ui serverdialog.cpp serverdialog.h EditDlg.ui editdialog.cpp editdialog.h commanddialog.cpp commanddialog.h CommandDlg.ui commandlist.cpp commandlist.h CommandEntryDlg.ui commandentrydialog.cpp commandentrydialog.h configelem.cpp configelem.h kshowmaildock.cpp kshowmaildock.h configlist.cpp configlist.h AlertDlg.ui alertdialog.cpp alertdialog.h uniqueapp.cpp uniqueapp.h showrecordelem.cpp showrecordelem.h showrecord.cpp showrecord.h kshowmail.desktop decodeRFC2047.h decodeRFC2047.cpp showlistviewitem.cpp showlistviewitem.h kfeedback.cpp kfeedback.h kshowmailfeedback.cpp filter.cpp filter.h filterelem.cpp filterelem.h filterdialog.cpp filterdialog.h FilterDlg.ui FilterEntryDlg.ui filterentrydialog.cpp filterentrydialog.h filterlist.cpp filterlist.h logger.cpp logger.h EXTRA_DIST = main.cpp kshowmail.cpp kshowmail.h kshowmaildoc.cpp kshowmaildoc.h commandentry.cpp commandentry.h kshowmailview.cpp kshowmailview.h OptionDlg.ui OptionDlg.h optiondialog.cpp optiondialog.h ServerDlg.ui serverdialog.cpp serverdialog.h EditDlg.ui editdialog.cpp editdialog.h commanddialog.cpp commanddialog.h CommandDlg.ui commandlist.cpp commandlist.h CommandEntryDlg.ui commandentrydialog.cpp commandentrydialog.h configelem.cpp configelem.h kshowmaildock.cpp kshowmaildock.h configlist.cpp configlist.h AlertDlg.ui alertdialog.cpp alertdialog.h uniqueapp.cpp uniqueapp.h showrecordelem.cpp showrecordelem.h showrecord.cpp showrecord.h kshowmail.desktop decodeRFC2047.h decodeRFC2047.cpp showlistviewitem.cpp showlistviewitem.h kfeedback.cpp kfeedback.h kshowmailfeedback.cpp filter.cpp filter.h filterelem.cpp filterelem.h filterdialog.cpp filterdialog.h FilterDlg.ui FilterEntryDlg.ui filterentrydialog.cpp filterentrydialog.h filterlist.cpp filterlist.h logger.cpp logger.h

14
kshowmail/kcmconfigs/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_kshowmailconfigaccounts.la \ kde_module_LTLIBRARIES = kcm_kshowmailconfigaccounts.la \
kcm_kshowmailconfigactions.la kcm_kshowmailconfigdisplay.la kcm_kshowmailconfigfilter.la \ kcm_kshowmailconfigactions.la kcm_kshowmailconfigdisplay.la kcm_kshowmailconfigfilter.la \
kcm_kshowmailconfiggeneral.la kcm_kshowmailconfiglog.la kcm_kshowmailconfigspamcheck.la kcm_kshowmailconfiggeneral.la kcm_kshowmailconfiglog.la kcm_kshowmailconfigspamcheck.la
kcm_kshowmailconfigactions_la_LDFLAGS = -avoid-version -module $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) kcm_kshowmailconfigactions_la_LDFLAGS = -avoid-version -module $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
noinst_HEADERS = accountsetupdialog.h accountsetupitem.h configaccounts.h \ noinst_HEADERS = accountsetupdialog.h accountsetupitem.h configaccounts.h \
configactions.h configdisplay.h configfilter.h configgeneral.h configlog.h \ configactions.h configdisplay.h configfilter.h configgeneral.h configlog.h \
configspamcheck.h encryption.h filtercriteriawidget.h filtersetupdialog.h \ configspamcheck.h encryption.h filtercriteriawidget.h filtersetupdialog.h \
@ -14,23 +14,23 @@ kde_services_DATA = kshowmailconfigaccounts.desktop \
kshowmailconfigactions.desktop kshowmailconfigdisplay.desktop kshowmailconfigfilter.desktop \ kshowmailconfigactions.desktop kshowmailconfigdisplay.desktop kshowmailconfigfilter.desktop \
kshowmailconfiggeneral.desktop kshowmailconfiglog.desktop kshowmailconfigspamcheck.desktop kshowmailconfiggeneral.desktop kshowmailconfiglog.desktop kshowmailconfigspamcheck.desktop
kcm_kshowmailconfiggeneral_la_LDFLAGS = -avoid-version -module\ kcm_kshowmailconfiggeneral_la_LDFLAGS = -avoid-version -module\
$(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
kcm_kshowmailconfiggeneral_la_SOURCES = configgeneral.cpp kcm_kshowmailconfiggeneral_la_SOURCES = configgeneral.cpp
kcm_kshowmailconfigdisplay_la_LDFLAGS = -avoid-version -module\ kcm_kshowmailconfigdisplay_la_LDFLAGS = -avoid-version -module\
$(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
kcm_kshowmailconfigdisplay_la_SOURCES = configdisplay.cpp kcm_kshowmailconfigdisplay_la_SOURCES = configdisplay.cpp
kcm_kshowmailconfigaccounts_la_LDFLAGS = -avoid-version -module\ kcm_kshowmailconfigaccounts_la_LDFLAGS = -avoid-version -module\
$(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdewalletclient $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdewalletclient
kcm_kshowmailconfigaccounts_la_SOURCES = configaccounts.cpp \ kcm_kshowmailconfigaccounts_la_SOURCES = configaccounts.cpp \
accountsetupitem.cpp accountsetupdialog.cpp encryption.cpp tdewalletaccess.cpp accountsetupitem.cpp accountsetupdialog.cpp encryption.cpp tdewalletaccess.cpp
kcm_kshowmailconfigfilter_la_LDFLAGS = -avoid-version -module\ kcm_kshowmailconfigfilter_la_LDFLAGS = -avoid-version -module\
$(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
kcm_kshowmailconfigfilter_la_SOURCES = configfilter.cpp senderlistdialog.cpp \ kcm_kshowmailconfigfilter_la_SOURCES = configfilter.cpp senderlistdialog.cpp \
filtersetupitem.cpp filtersetupdialog.cpp filtercriteriawidget.cpp mailboxwizard.cpp \ filtersetupitem.cpp filtersetupdialog.cpp filtercriteriawidget.cpp mailboxwizard.cpp \
mailboxwizardlistitem.cpp mailboxwizardlistitem.cpp
kcm_kshowmailconfiglog_la_LDFLAGS = $(all_libraries) -avoid-version -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) kcm_kshowmailconfiglog_la_LDFLAGS = $(all_libraries) -avoid-version -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
kcm_kshowmailconfiglog_la_SOURCES = configlog.cpp kcm_kshowmailconfiglog_la_SOURCES = configlog.cpp
kcm_kshowmailconfigspamcheck_la_LDFLAGS = $(all_libraries) -avoid-version \ kcm_kshowmailconfigspamcheck_la_LDFLAGS = $(all_libraries) -avoid-version \
-module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
kcm_kshowmailconfigspamcheck_la_SOURCES = configspamcheck.cpp mailboxwizard.cpp \ kcm_kshowmailconfigspamcheck_la_SOURCES = configspamcheck.cpp mailboxwizard.cpp \
mailboxwizardlistitem.cpp mailboxwizardlistitem.cpp

Write Preview
Loading…
Cancel
Save