From 7e1584c4726a2e03ead7cee4307ec50e4c2eac3f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 24 Apr 2009 11:26:59 +0000 Subject: [PATCH] 2009-04-24 13:18 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * INSTALL * Changed QT examples according to 4.5.1 new default dir layout. * contrib/gtqtc/tests/demoqtc.prg ! Removed zip dependency. * contrib/gtqtc/tests/wvtext.prg ! Fixed non-lower case filename. ! Fixed wrong reference to test .ico file. BTW, is .ico portable? I doubt, so we should probably switch to .png in context of QT. ! Fixed wrong reference to test.dbf. * contrib/hbqt/tests/hbqt.hbp * contrib/gtqtc/tests/gtqtc.hbp + Added support for HB_QT_DIR envvar to find QT libs. This is the same envvar which is needed for Harbour builds, so you may already have it set up. ; TODO: If this works out well, I'll add the same method for other contribs too. * utils/hbmk2/hbmk2.prg + libpaths will now be checked for existance before being added to the list. --- harbour/ChangeLog | 26 +++++++++++++++++++++++++ harbour/INSTALL | 6 +++--- harbour/contrib/gtqtc/tests/demoqtc.prg | 2 -- harbour/contrib/gtqtc/tests/gtqtc.hbp | 4 +++- harbour/contrib/gtqtc/tests/wvtext.prg | 6 +++--- harbour/contrib/hbqt/tests/hbqt.hbp | 4 +++- harbour/utils/hbmk2/hbmk2.prg | 12 +++++++----- 7 files changed, 45 insertions(+), 15 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bf8d296f6c..df1830f832 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,32 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-24 13:18 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * INSTALL + * Changed QT examples according to 4.5.1 new default dir layout. + + * contrib/gtqtc/tests/demoqtc.prg + ! Removed zip dependency. + + * contrib/gtqtc/tests/wvtext.prg + ! Fixed non-lower case filename. + ! Fixed wrong reference to test .ico file. + BTW, is .ico portable? I doubt, so we should probably + switch to .png in context of QT. + ! Fixed wrong reference to test.dbf. + + * contrib/hbqt/tests/hbqt.hbp + * contrib/gtqtc/tests/gtqtc.hbp + + Added support for HB_QT_DIR envvar to find QT libs. + This is the same envvar which is needed for Harbour + builds, so you may already have it set up. + ; TODO: If this works out well, I'll add the same method + for other contribs too. + + * utils/hbmk2/hbmk2.prg + + libpaths will now be checked for existance before being + added to the list. + 2009-04-23 22:11 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/common/hbprintf.c * harbour/source/macro/macro.yyc diff --git a/harbour/INSTALL b/harbour/INSTALL index 2f69ffa0a0..ce0a8f667a 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -147,7 +147,7 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD HB_INC_MYSQL=C:\mysql\include HB_INC_OPENSSL=C:\openssl\inc32 HB_INC_PGSQL=C:\pgsql\include - HB_INC_QT=C:\Qt\2009.01\qt\include + HB_INC_QT=C:\Qt\4.5.1\include HB_INC_SQLITE3=C:\sqlite3 (defaults to locally hosted version on win/os2) NOTES: - For mingw+msys and cygwin you have to use forward slashes @@ -496,7 +496,7 @@ EXAMPLES set HB_INC_MYSQL=C:\mysql\include set HB_INC_OPENSSL=C:\openssl\inc32 set HB_INC_PGSQL=C:\pgsql\include - set HB_INC_QT=C:\Qt\2009.01\qt\include + set HB_INC_QT=C:\Qt\4.5.1\include -->8-- --8<-- @@ -514,7 +514,7 @@ EXAMPLES set HB_DIR_MYSQL=C:\mysql set HB_DIR_OPENSSL=C:\openssl set HB_DIR_PGSQL=C:\pgsql - set HB_DIR_QT=C:\Qt\2009.01\qt + set HB_DIR_QT=C:\Qt\4.5.1 rem set HB_BUILD_IMPLIB=yes -->8-- diff --git a/harbour/contrib/gtqtc/tests/demoqtc.prg b/harbour/contrib/gtqtc/tests/demoqtc.prg index 44d6d4d466..d43d994915 100644 --- a/harbour/contrib/gtqtc/tests/demoqtc.prg +++ b/harbour/contrib/gtqtc/tests/demoqtc.prg @@ -27,8 +27,6 @@ #define HB_GTI_SETPARENT 101 #define HB_GTI_WINHANDLE 102 -REQUEST HB_ZipOpen - //----------------------------------------------------------------------// STATIC nRows := 20, nCols := 60, nColorIndex := 1 diff --git a/harbour/contrib/gtqtc/tests/gtqtc.hbp b/harbour/contrib/gtqtc/tests/gtqtc.hbp index e383a61d2f..ebb034783e 100644 --- a/harbour/contrib/gtqtc/tests/gtqtc.hbp +++ b/harbour/contrib/gtqtc/tests/gtqtc.hbp @@ -2,7 +2,9 @@ # $Id$ # -{mingw|(gcc&(linux|darwin))}libs=supc++ +{allwin}libpaths=${HB_DIR_QT}\lib + +{mingw|mingwce|(gcc&(linux|darwin))}libs=supc++ {!darwin}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4 {darwin}libs=/Library/Frameworks/QtCore.framework/QtCore {darwin}libs=/Library/Frameworks/QtGui.framework/QtGui diff --git a/harbour/contrib/gtqtc/tests/wvtext.prg b/harbour/contrib/gtqtc/tests/wvtext.prg index 84985c2283..49edd8659c 100644 --- a/harbour/contrib/gtqtc/tests/wvtext.prg +++ b/harbour/contrib/gtqtc/tests/wvtext.prg @@ -42,7 +42,7 @@ FUNCTION Main() Hb_GtInfo( HB_GTI_FONTNAME , cFont ) Hb_GtInfo( HB_GTI_FONTWIDTH, nWidth ) Hb_GtInfo( HB_GTI_FONTSIZE , nHeight ) - Hb_GtInfo( HB_GTI_ICONFILE, "..\contrib\gtwvg\tests\vr_1.ico" ) + Hb_GtInfo( HB_GTI_ICONFILE, "../../../contrib/hbqt/tests/test.ico" ) SetCursor( 0 ) SetColor( "n/w" ) @@ -209,7 +209,7 @@ PROCEDURE thFunc() if ( nBrowser % 2 ) != 0 Hb_GtInfo( HB_GTI_RESIZEMODE, HB_GTI_RESIZEMODE_ROWS ) endif - Hb_GtInfo( HB_GTI_WINTITLE, 'Test.dbf ['+if( ( nBrowser % 2 ) != 0, 'RESIZABLE_BY_ROWS', 'RESIZABLE_BY_FONT' )+']' ) + Hb_GtInfo( HB_GTI_WINTITLE, 'test.dbf ['+if( ( nBrowser % 2 ) != 0, 'RESIZABLE_BY_ROWS', 'RESIZABLE_BY_FONT' )+']' ) SetColor( aColor[ nColorIndex ] ) CLS @@ -235,7 +235,7 @@ PROCEDURE thFunc() cTitle := ' Modal Dialog ' DispOutAt( MaxRow(), 0, padc( cTitle, maxcol()+1 ), 'W+/R*' ) - use test shared + use ../../../tests/test shared aStruct := DbStruct() oBrowse := TBrowse():New( 1, 0, maxrow()-1, maxcol() ) diff --git a/harbour/contrib/hbqt/tests/hbqt.hbp b/harbour/contrib/hbqt/tests/hbqt.hbp index 39fae53f42..957e264cc4 100644 --- a/harbour/contrib/hbqt/tests/hbqt.hbp +++ b/harbour/contrib/hbqt/tests/hbqt.hbp @@ -2,7 +2,9 @@ # $Id$ # -{mingw|(gcc&(linux|darwin))}libs=supc++ +{allwin}libpaths=${HB_DIR_QT}\lib + +{mingw|mingwce|(gcc&(linux|darwin))}libs=supc++ libs=hbqt {!darwin}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4 {darwin}libs=/Library/Frameworks/QtCore.framework/QtCore diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 0bf8e215d3..3eddc260b5 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1095,9 +1095,9 @@ FUNCTION hbmk( aArgs ) CASE Left( cParam, 2 ) == "-L" .AND. ; Len( cParam ) > 2 - cParam := MacroProc( ArchCompFilter( SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) - IF ! Empty( cParam ) - AAdd( s_aLIBPATH, PathSepToTarget( cParam ) ) + cParam := PathSepToTarget( MacroProc( ArchCompFilter( SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) ) + IF ! Empty( cParam ) .AND. hb_DirExists( cParam ) + AAdd( s_aLIBPATH, cParam ) ENDIF CASE Left( cParamL, 2 ) == "-i" .AND. ; @@ -3992,8 +3992,10 @@ STATIC PROCEDURE HBP_ProcessOne( cFileName,; CASE Lower( Left( cLine, Len( "libpaths=" ) ) ) == "libpaths=" ; cLine := SubStr( cLine, Len( "libpaths=" ) + 1 ) FOR EACH cItem IN hb_ATokens( cLine,, .T. ) cItem := PathSepToTarget( MacroProc( StrStripQuote( cItem ), FN_DirGet( cFileName ) ) ) - IF AScan( aLIBPATH, {|tmp| tmp == cItem } ) == 0 - AAddNotEmpty( aLIBPATH, cItem ) + IF ! Empty( cItem ) .AND. hb_DirExists( cItem ) + IF AScan( aLIBPATH, {|tmp| tmp == cItem } ) == 0 + AAdd( aLIBPATH, cItem ) + ENDIF ENDIF NEXT