fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-05-13 16:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/hbmk2_qt.hb
    - Removed: #define __GCMARK__

  * contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth
    ! Fixed: wrong "Inherit" value - qStyleOption => QStyleOption.
This commit is contained in:
Pritpal Bedi
2012-05-13 23:50:05 +00:00
parent 8f8cb5927c
commit e3232318b2
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -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.

5
harbour/contrib/hbqt/hbmk2_qt.hb
View File

@@ -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_

2
harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth
View File

@@ -13,7 +13,7 @@
<CLASS>
QObject = no
Inherit = qStyleOption
Inherit = QStyleOption
Type = Core
New =
</CLASS>