diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c3e1546f97..588f9b5e6d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2012-08-19 17:34 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/hbmk2_qt.hb + ! Fixed: the treatment of html compliant ->setToolTip( calls. + It has been tedius because it went unnoticed due to Qt versions + where they always keep on changing the string treatment. + This fixes issue reported on users list. + 2012-08-19 13:49 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp ! Reinstated: execution of Mouse events to PRG level. These events diff --git a/harbour/contrib/hbqt/hbmk2_qt.hb b/harbour/contrib/hbqt/hbmk2_qt.hb index 225606f2f3..21ac96b903 100644 --- a/harbour/contrib/hbqt/hbmk2_qt.hb +++ b/harbour/contrib/hbqt/hbmk2_qt.hb @@ -985,7 +985,7 @@ STATIC FUNCTION hbqtui_pullTranslate( cCmd ) cArgs := AllTrim( Left( cArgs, n4 - 1 ) ) // cArgs := HB_STRDECODESCAPE( SubStr( cArgs, 2, Len( cArgs ) - 2 ) ) - IF "DOCTYPE HTML PUBLIC" $ cArgs + IF "DOCTYPE HTML PUBLIC" $ cArgs .OR. "" $ cArgs cArgs := StrTran( cArgs, '\"', '"' ) cArgs := StrTran( cArgs, '\n', " " ) cArgs := StrTran( cArgs, '""' ) @@ -1206,6 +1206,11 @@ STATIC FUNCTION hbqtui_pullSetToolTip( aLines, nFrom ) aLines[ nFrom ] := "" nFrom++ ENDDO + IF ! Empty( cString ) + cString := StrTran( cString, "QString::fromUtf8" ) + cString := StrTran( cString, '\"' ) + cString := StrTran( cString, "\n", " " ) + ENDIF ENDIF RETURN cString