diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9ecdcbdd34..30bb606f2f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-11 18:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbqt/generator/hbqtgen.prg + * contrib/hbqt/hbqt.h + ! Deleted Windows-specific lines. + 2009-04-11 18:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/Makefile * harbour/source/vm/vmmt/Makefile @@ -29,7 +34,7 @@ + Added skeleton for hb_verHostCPU() * source/rtl/trace.c - ! HB_TRACESTRING() fixed potential GPF if non-string parameter + ! HB_TRACESTRING() fixed potential GPF if non-string parameter was passed. * contrib/hbqt/generator/hbqtgen.prg @@ -53,10 +58,10 @@ * contrib/hbqt/Makefile * contrib/hbqt/generator/hbqtgen.prg + Added support for QT for Darwin official SDK package - I had to change the way headers are included to follow the - QT standard and pass each QT lib header dir on the command + I had to change the way headers are included to follow the + QT standard and pass each QT lib header dir on the command line instead of using subdirs in #include directives. - ; TODO: Probably this change should be applied to all .qth files, + ; TODO: Probably this change should be applied to all .qth files, but on Darwin it worked without this change for some reason. * contrib/hbqt/tests/demoqt.prg @@ -79,7 +84,7 @@ c: hb_verCPU() -> "x86" prg: hb_version( HB_VERSION_CPU ) -> "x86" ; TODO: Host CPU detection. - + * contrib/rddsql/sddfb/Makefile + Enabled for msvc64 @@ -140,7 +145,7 @@ * harbour/contrib/hbqt/generator/hbqtgen.prg - Removed WIN specific castings. * harbour/contrib/gtwvg/wvgsink.c - ! Commented out calls to hb_ToOutDebug(). + ! Commented out calls to hb_ToOutDebug(). 2009-04-10 16:45 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/rddsql/sddfb/fbirddd.c diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index c3bcad73b6..fc3459af60 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -1390,18 +1390,14 @@ STATIC FUNCTION Build_HBQT_H( cPathOut ) aadd( txt_, "#define hbqt_par_QNetworkRequest( n ) ( ( QNetworkRequest* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QTableWidgetSelectionRange( n ) ( ( QTableWidgetSelectionRange* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QWSEvent( n ) ( ( QWSEvent* ) hb_parptr( n ) ) " ) - aadd( txt_, "#define hbqt_par_HFONT( n ) ( ( HFONT* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QHttpRequestHeader( n ) ( ( QHttpRequestHeader* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QNetworkProxy( n ) ( ( QNetworkProxy* ) hb_parptr( n ) ) " ) - aadd( txt_, "#define hbqt_par_WId( n ) ( ( HWND* ) hb_parptr( n ) ) " ) - aadd( txt_, "#define hbqt_par_HDC( n ) ( ( HDC* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QBitmap( n ) ( ( QBitmap* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QTextStream( n ) ( ( QTextStream* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QTextCodec( n ) ( ( QTextCodec* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QEventLoop( n ) ( ( QEventLoop* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QPaintEvent( n ) ( ( QPaintEvent* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QInputEvent( n ) ( ( QInputEvent* ) hb_parptr( n ) ) " ) - aadd( txt_, "#define hbqt_par_HRGN( n ) ( ( HRGN* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QIcon( n ) ( ( QIcon* ) hb_parc( n ) ) " ) aadd( txt_, "#define hbqt_par_QStyleOption( n ) ( ( QStyleOption* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QStyleOptionComplex( n ) ( ( QStyleOptionComplex* ) hb_parptr( n ) ) " ) diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index e18e499a13..558f74f8f3 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -220,18 +220,14 @@ #define hbqt_par_QNetworkRequest( n ) ( ( QNetworkRequest* ) hb_parptr( n ) ) #define hbqt_par_QTableWidgetSelectionRange( n ) ( ( QTableWidgetSelectionRange* ) hb_parptr( n ) ) #define hbqt_par_QWSEvent( n ) ( ( QWSEvent* ) hb_parptr( n ) ) -#define hbqt_par_HFONT( n ) ( ( HFONT* ) hb_parptr( n ) ) #define hbqt_par_QHttpRequestHeader( n ) ( ( QHttpRequestHeader* ) hb_parptr( n ) ) #define hbqt_par_QNetworkProxy( n ) ( ( QNetworkProxy* ) hb_parptr( n ) ) -#define hbqt_par_WId( n ) ( ( HWND* ) hb_parptr( n ) ) -#define hbqt_par_HDC( n ) ( ( HDC* ) hb_parptr( n ) ) #define hbqt_par_QBitmap( n ) ( ( QBitmap* ) hb_parptr( n ) ) #define hbqt_par_QTextStream( n ) ( ( QTextStream* ) hb_parptr( n ) ) #define hbqt_par_QTextCodec( n ) ( ( QTextCodec* ) hb_parptr( n ) ) #define hbqt_par_QEventLoop( n ) ( ( QEventLoop* ) hb_parptr( n ) ) #define hbqt_par_QPaintEvent( n ) ( ( QPaintEvent* ) hb_parptr( n ) ) #define hbqt_par_QInputEvent( n ) ( ( QInputEvent* ) hb_parptr( n ) ) -#define hbqt_par_HRGN( n ) ( ( HRGN* ) hb_parptr( n ) ) #define hbqt_par_QIcon( n ) ( ( QIcon* ) hb_parc( n ) ) #define hbqt_par_QStyleOption( n ) ( ( QStyleOption* ) hb_parptr( n ) ) #define hbqt_par_QStyleOptionComplex( n ) ( ( QStyleOptionComplex* ) hb_parptr( n ) ) @@ -269,4 +265,3 @@ QPointF hbqt_const_QPointF( int ); #endif #endif /* __HBQT_H */ -