diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7a10798bff..4dcc4927dc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,22 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-06 09:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/hbqt.h + * contrib/hbqt/qth/QConicalGradient.qth + * contrib/hbqt/qth/QLinearGradient.qth + * contrib/hbqt/hbqt_qconicalgradient.cpp + * contrib/hbqt/hbqt_qlineargradient.cpp + ! Fixed two missing function name from .qth template. + (the ones reported on the dev list) + + - contrib/hbqt/generator/rebuild_hbqt.bat + - Deleted, it's no longer needed. + Enough to build hbqtgen with: + hbmk2 hbqtgen.prg + Then run it: + hbqtgen + 2009-06-06 09:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/errintlo.c ! fixed GPF inside internal error handler for errors without default diff --git a/harbour/contrib/hbqt/generator/rebuild_hbqt.bat b/harbour/contrib/hbqt/generator/rebuild_hbqt.bat deleted file mode 100644 index 832275c59c..0000000000 --- a/harbour/contrib/hbqt/generator/rebuild_hbqt.bat +++ /dev/null @@ -1,55 +0,0 @@ -@rem -@rem $Id$ -@rem - -@echo off - -echo. Making hbqtgen ... -set _HBMK=hbmk2.exe -if exist ..\..\..\bin\hbmk2.exe set _HBMK=..\..\..\bin\hbmk2.exe -%_HBMK% hbqtgen -IF ERRORLEVEL 1 GOTO SHOW_ERROR -echo. done -echo. -echo. Cleaning gensource and doc folders ... -del ..\gensource\*.prg > nul -del ..\gensource\*.cpp > nul -del ..\gensource\*.h > nul -del ..\gensource\Makefile_gen > nul -del ..\doc\*.txt > nul -echo. done -echo. -echo. Generating gensource and doc files -hbqtgen.exe > hbqtgen.log 2>&1 -IF ERRORLEVEL 1 GOTO SHOW_ERROR -echo. done -echo. -echo. Cleaning hbqt root files ... -del ..\*.prg > nul -del ..\*.cpp > nul -del ..\*.h > nul -del ..\Makefile_gen. > nul -echo. done -echo. -echo. Copying source files ... -copy ..\gensource\*.prg .. > nul -copy ..\gensource\*.cpp .. > nul -copy ..\gensource\*.h .. > nul -copy ..\gensource\Makefile_gen .. > nul -echo. done -echo. -echo. Change folder to hbqt root -cd .. -echo. completed. -echo. -echo. Please now rebuild SVN using command: -echo. make_gnu install -echo. - -GOTO END_BATCH - -:SHOW_ERROR -echo. There is an error on building hbqt. -echo. Please check hbqtgen.log file - -:END_BATCH diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index 2344eeb540..24fd2aeea1 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -58,7 +58,6 @@ #include #include -/* #include */ #include #include diff --git a/harbour/contrib/hbqt/hbqt_qconicalgradient.cpp b/harbour/contrib/hbqt/hbqt_qconicalgradient.cpp index efbbb2f2e0..700b723a81 100644 --- a/harbour/contrib/hbqt/hbqt_qconicalgradient.cpp +++ b/harbour/contrib/hbqt/hbqt_qconicalgradient.cpp @@ -68,7 +68,7 @@ * QConicalGradient ( const QPointF & center, qreal angle ) * QConicalGradient ( qreal cx, qreal cy, qreal angle ) */ -HB_FUNC( QT_ ) +HB_FUNC( QT_QCONICALGRADIENT ) { hb_retptr( ( QConicalGradient* ) new QConicalGradient() ); } diff --git a/harbour/contrib/hbqt/hbqt_qlineargradient.cpp b/harbour/contrib/hbqt/hbqt_qlineargradient.cpp index 5de3619d76..9d25346ffc 100644 --- a/harbour/contrib/hbqt/hbqt_qlineargradient.cpp +++ b/harbour/contrib/hbqt/hbqt_qlineargradient.cpp @@ -68,7 +68,7 @@ * QLinearGradient ( const QPointF & start, const QPointF & finalStop ) * QLinearGradient ( qreal x1, qreal y1, qreal x2, qreal y2 ) */ -HB_FUNC( QT_ ) +HB_FUNC( QT_QLINEARGRADIENT ) { hb_retptr( ( QLinearGradient* ) new QLinearGradient() ); } diff --git a/harbour/contrib/hbqt/qth/QConicalGradient.qth b/harbour/contrib/hbqt/qth/QConicalGradient.qth index 4f74df0dd3..ac418cae3a 100644 --- a/harbour/contrib/hbqt/qth/QConicalGradient.qth +++ b/harbour/contrib/hbqt/qth/QConicalGradient.qth @@ -57,7 +57,7 @@ Inherits = QGradient Type = Core -New = +New = @@ -69,7 +69,7 @@ New = * QConicalGradient ( const QPointF & center, qreal angle ) * QConicalGradient ( qreal cx, qreal cy, qreal angle ) */ -HB_FUNC( QT_ ) +HB_FUNC( QT_QCONICALGRADIENT ) { hb_retptr( ( QConicalGradient* ) new QConicalGradient() ); } @@ -94,7 +94,3 @@ void setCenter ( qreal x, qreal y ) - - - - diff --git a/harbour/contrib/hbqt/qth/QLinearGradient.qth b/harbour/contrib/hbqt/qth/QLinearGradient.qth index 29fe928d27..af17d43a30 100644 --- a/harbour/contrib/hbqt/qth/QLinearGradient.qth +++ b/harbour/contrib/hbqt/qth/QLinearGradient.qth @@ -57,7 +57,7 @@ Inherits = QGradient Type = Core -New = +New = @@ -69,7 +69,7 @@ New = * QLinearGradient ( const QPointF & start, const QPointF & finalStop ) * QLinearGradient ( qreal x1, qreal y1, qreal x2, qreal y2 ) */ -HB_FUNC( QT_ ) +HB_FUNC( QT_QLINEARGRADIENT ) { hb_retptr( ( QLinearGradient* ) new QLinearGradient() ); } @@ -95,7 +95,3 @@ QPointF start () const - - - -