Rename kiobuffer and KHTML

r14.0.x
Timothy Pearson 12 years ago
parent 349efc60a4
commit dfbcbbfd36

@ -2066,7 +2066,7 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@ -2087,7 +2087,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")

@ -1 +1 @@
Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d Subproject commit 274366fb8b90704586d7beef216b765cc0688b08

@ -138,7 +138,7 @@ void GVImagePart::partActivateEvent(KParts::PartActivateEvent* event) {
void GVImagePart::guiActivateEvent( KParts::GUIActivateEvent* event) { void GVImagePart::guiActivateEvent( KParts::GUIActivateEvent* event) {
// Stolen from KHTMLImage // Stolen from TDEHTMLImage
// //
// prevent the base implementation from emitting setWindowCaption with // prevent the base implementation from emitting setWindowCaption with
// our url. It destroys our pretty, previously caption. Konq saves/restores // our url. It destroys our pretty, previously caption. Konq saves/restores

Loading…
Cancel
Save