From e3232318b2c54dab2790d548122cd4c0caccb66b Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sun, 13 May 2012 23:50:05 +0000 Subject: [PATCH] 2012-05-13 16:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hb - Removed: #define __GCMARK__ * contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth ! Fixed: wrong "Inherit" value - qStyleOption => QStyleOption. --- harbour/ChangeLog | 7 +++++++ harbour/contrib/hbqt/hbmk2_qt.hb | 5 ----- harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 40f3666ea0..c305d8d9dc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2012-05-13 16:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/hbmk2_qt.hb + - Removed: #define __GCMARK__ + + * contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth + ! Fixed: wrong "Inherit" value - qStyleOption => QStyleOption. + 2012-05-13 12:44 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hb ! Fixed: to properly handle HBQxxx classes alongwith Qxxx ones. diff --git a/harbour/contrib/hbqt/hbmk2_qt.hb b/harbour/contrib/hbqt/hbmk2_qt.hb index 65be644d12..62a9e73894 100644 --- a/harbour/contrib/hbqt/hbmk2_qt.hb +++ b/harbour/contrib/hbqt/hbmk2_qt.hb @@ -1508,9 +1508,7 @@ METHOD HbQtSource:build() AAdd( aLine, " bool bNew;" ) AAdd( aLine, " PHBQT_GC_FUNC func;" ) AAdd( aLine, " HB_U32 type;" ) -#ifdef __GCMARK__ AAdd( aLine, " PHBQT_GC_FUNC mark;" ) -#endif AAdd( aLine, "} HBQT_GC_T_" + ::cQtObject + ";" ) AAdd( aLine, " " ) AAdd( aLine, " " ) @@ -1637,14 +1635,11 @@ METHOD HbQtSource:build() AAdd( aLine, " p->bNew = bNew;" ) AAdd( aLine, " p->func = hbqt_gcRelease_" + ::cQtObject + ";" ) AAdd( aLine, " p->type = HBQT_TYPE_" + ::cQtObject + ";" ) - -#ifdef __GCMARK__ if n > 0 AAdd( aLine, " p->mark = hbqt_gcMark_" + ::cQtObject + ";" ) else AAdd( aLine, " p->mark = NULL;" ) ENDIF -#endif AAdd( aLine, "" ) #ifdef _GEN_TRACE_ diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth index 67f25eaf0b..078d36311d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth @@ -13,7 +13,7 @@ QObject = no -Inherit = qStyleOption +Inherit = QStyleOption Type = Core New =