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

2009-08-25 20:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbqt/hbqt_slots.cpp
    ! Fixed regression in 2009-08-22 22:33.

  * config/global.mk
    * Minor cosmetic.
This commit is contained in:
Viktor Szakats
2009-08-25 18:19:09 +00:00
parent 6198372169
commit df030c4548
3 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-25 20:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/hbqt_slots.cpp
! Fixed regression in 2009-08-22 22:33. Please test.
* config/global.mk
* Minor cosmetic.
2009-08-25 20:01 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/utils/hbtest/rt_hvma.prg
* use '#pragma' -ko- to test '("NOTHERE")->(Eof())' results

18
harbour/config/global.mk
View File

@@ -282,7 +282,7 @@ ifeq ($(HB_INIT_DONE),)
# -DHB_PCRE_REGEX, -DHB_POSIX_REGEX, -DHB_EXT_ZLIB, -DHB_HAS_GPM, -DHB_GT_LIB=
$(info ! Building Harbour $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(HB_VER_STATUS) from source - http://www.harbour-project.org)
$(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(HB_MAKECMDGOALS) $(MAKEFLAGS) $(SHELL) $(if $(MAKESHELL), MAKESHELL: $(MAKESHELL),))
$(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(SHELL) $(HB_MAKECMDGOALS) $(MAKEFLAGS) $(if $(MAKESHELL),MAKESHELL: $(MAKESHELL),))
ifneq ($(HB_USER_PRGFLAGS),)
$(info ! HB_USER_PRGFLAGS: $(HB_USER_PRGFLAGS))
endif
@@ -460,22 +460,6 @@ else
HB_HOST_BIN_EXT :=
endif
# Couldn't find a builds of these tools which would fit Harbour respository,
# so these will have to installed by user.
#ifeq ($(HB_SHELL),os2)
# ifeq ($(call find_in_path,mkdir),)
# $(error ! Harbour build on OS/2 requires GNU mkdir executable in PATH. See INSTALL for more)
# else
# ifeq ($(call find_in_path,rm),)
# $(error ! Harbour build on OS/2 requires GNU rm executable in PATH. See INSTALL for more)
# else
# ifeq ($(call find_in_path,cp),)
# $(error ! Harbour build on OS/2 requires GNU cp executable in PATH. See INSTALL for more)
# endif
# endif
# endif
#endif
HB_HOST_CPU :=
ifeq ($(HB_HOST_PLAT),win)
ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)

8
harbour/contrib/hbqt/hbqt_slots.cpp
View File

@@ -2016,12 +2016,10 @@ QVariant HbDbfModel::headerData( int section, Qt::Orientation orientation, int r
int HbDbfModel::rowCount( const QModelIndex & /*parent = QModelIndex()*/ ) const
{
PHB_ITEM p0 = hb_itemPutNI( NULL, HBQT_BRW_ROWCOUNT );
PHB_ITEM ret = hb_vmEvalBlockV( block, 1, p0 );
int result = hb_itemGetNI( ret );
int result = hb_itemGetNI( hb_vmEvalBlockV( block, 1, p0 ) );
hb_itemRelease( p0 );
hb_itemRelease( ret );
return result;
}
@@ -2029,12 +2027,10 @@ int HbDbfModel::rowCount( const QModelIndex & /*parent = QModelIndex()*/ ) const
int HbDbfModel::columnCount( const QModelIndex & /*parent = QModelIndex()*/ ) const
{
PHB_ITEM p0 = hb_itemPutNI( NULL, HBQT_BRW_COLCOUNT );
PHB_ITEM ret = hb_vmEvalBlockV( block, 1, p0 );
int result = hb_itemGetNI( ret );
int result = hb_itemGetNI( hb_vmEvalBlockV( block, 1, p0 ) );
hb_itemRelease( p0 );
hb_itemRelease( ret );
return result;
}