diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5fee8cc7f5..7975ee8537 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-18 17:41 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * harbour/contrib/gtqtc/Makefile
+    ! Adopted along hbqt/Makefile pattern.
+
+  + harbour/contrib/gtqtc/tests/wvtext.prg
+    + Added harbour/tests/wvtext.prg here also.
+      Change in only HB_GT_QTC_DEFAULT.
+      This facilitates the comparison between GTWVT and GTQTC
+    + Added harbour/tests/tests.ico
+      Used as hb_gtInfo( HB_GTI_ICONFILE, 'tests.ico' )
+
 2009-04-18 12:41 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/gtqtc/gtqtc.h
   * harbour/contrib/gtqtc/gtqtc.cpp
diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile
index ded12a68ee..ab0b789cf9 100644
--- a/harbour/contrib/gtqtc/Makefile
+++ b/harbour/contrib/gtqtc/Makefile
@@ -4,7 +4,7 @@
 
 ROOT = ../../
 
-LIBNAME=gtqtc
+LIBNAME=hbqt
 
 ifeq ($(HB_WITH_QT),)
 HB_WITH_QT=yes
@@ -38,15 +38,28 @@ ifeq ($(HB_WITH_QT),yes)
 
 ifeq ($(HB_INC_QT),)
 ifeq ($(HB_XBUILD),)
-HB_INC_QT = /usr/include/qt4 /Developer/qt/include
+HB_INC_QT = /usr/include/qt4 /usr/include /Developer/qt/include
 endif
 endif
 
 HB_INC_QT_OK += $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),))
+ifeq ($(HB_ARCHITECTURE),darwin)
+ifeq ($(strip $(HB_INC_QT_OK)),)
+HB_INC_QT_OK = $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
+ifeq ($(HB_INC_QT_OK),spec)
+HB_USER_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+HB_USER_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+HB_USER_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+HB_USER_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+endif
+endif
+endif
 
 ifneq ($(strip $(HB_INC_QT_OK)),)
 
-HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d))
+ifneq ($(strip $(HB_INC_QT_OK)),spec)
+HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+endif
 
 CPP_SOURCES=\
 	gtqtc.cpp \
@@ -70,3 +83,6 @@ endif
 else
 include $(TOP)$(ROOT)config/none.cf
 endif
+
+
+
diff --git a/harbour/contrib/gtqtc/tests/test.ico b/harbour/contrib/gtqtc/tests/test.ico
new file mode 100644
index 0000000000..9ff698dc26
Binary files /dev/null and b/harbour/contrib/gtqtc/tests/test.ico differ
diff --git a/harbour/contrib/gtqtc/tests/wvtext.prg b/harbour/contrib/gtqtc/tests/wvtext.prg
new file mode 100644
index 0000000000..972a45c2ad
--- /dev/null
+++ b/harbour/contrib/gtqtc/tests/wvtext.prg
@@ -0,0 +1,457 @@
+/*
+ * $Id$
+ */
+
+//----------------------------------------------------------------------//
+//----------------------------------------------------------------------//
+//----------------------------------------------------------------------//
+//
+//                  [x]Harbour Extended Features Deno
+//                                    .
+//                 Pritpal Bedi <pritpal@vouchcac.com>
+//
+//----------------------------------------------------------------------//
+//----------------------------------------------------------------------//
+//----------------------------------------------------------------------//
+
+#include "hbgtinfo.ch"
+#include "inkey.ch"
+#include "box.ch"
+
+#ifdef __GTWVG__
+#include "hbgtwvg.ch"
+#endif
+
+#define RGB(r,g,b) ( r + ( g * 256 ) + ( b * 256 * 256 ) )
+
+//----------------------------------------------------------------------//
+
+// To be in hbgtinfo.ch
+//
+#define HB_GTI_SETPARENT         101
+#define HB_GTI_WINHANDLE         102
+
+//----------------------------------------------------------------------//
+
+STATIC nRows := 20, nCols := 60, nColorIndex := 1
+
+//----------------------------------------------------------------------//
+FUNCTION Main()
+   Local nKey, lMark, lResize, lClose
+   Local nHeight := 20
+   Local nWidth  := Int( nHeight/2 )
+   Local cFont
+
+   Hb_GtInfo( HB_GTI_FONTNAME , cFont   )
+   Hb_GtInfo( HB_GTI_FONTWIDTH, nWidth  )
+   Hb_GtInfo( HB_GTI_FONTSIZE , nHeight )
+   #ifdef __GTWVG__
+   Hb_GtInfo( HB_GTI_ICONFILE, "..\contrib\gtwvg\tests\vr_1.ico" )
+   #endif
+   SetCursor( 0 )
+   SetColor( "n/w" )
+
+   HB_GtInfo( HB_GTI_NOTIFIERBLOCK, {|nEvent, ...| MyNotifier( nEvent, ... ) } )
+
+   DispScreen()
+
+   DO WHILE .T.
+      nKey := Inkey()
+      if nKey == K_ESC
+         exit
+      endif
+
+      DO CASE
+      CASE nKey == K_ENTER
+         Alert( "<Enter> Pressed" )
+
+      CASE nKey == K_F2
+         lMark := Hb_GtInfo( HB_GTI_SELECTCOPY )
+         Hb_GtInfo( HB_GTI_SELECTCOPY, !lMark )
+
+      CASE nKey == K_F3
+         lResize := Hb_GtInfo( HB_GTI_RESIZABLE )
+         Hb_GtInfo( HB_GTI_RESIZABLE, !lResize )
+
+      CASE nKey == K_F4
+         lClose := Hb_GtInfo( HB_GTI_CLOSABLE )
+         hb_GtInfo( HB_GTI_CLOSABLE, !lClose )
+
+      CASE nKey == K_F5
+         SetPalette( 1 )
+
+      CASE nKey == K_F6
+         SetPalette( 0 )
+
+      CASE nKey == K_F7
+         SetPaletteIndex()
+
+      CASE nKey == K_F8
+         Alert( "Menu text changed. Was: " + hb_GtInfo( HB_GTI_SELECTCOPY, DToS(Date()) + " " + Time() ) )
+
+      ENDCASE
+   ENDDO
+
+   RETURN NIL
+//----------------------------------------------------------------------//
+STATIC FUNCTION MyNotifier( nEvent, ... )
+
+   DO CASE
+
+   CASE nEvent == HB_GTE_SETFOCUS
+      DispScreen()
+      DispOutAt( maxrow(), 35, "In  Focus", "B/G*" )
+
+   CASE nEvent == HB_GTE_KILLFOCUS
+      DispScreen()
+      DispOutAt( maxrow(), 35, "Out Focus", "B/G*" )
+
+   CASE nEvent == HB_GTE_CLOSE
+      DispScreen()
+      if Alert( "Close Application", {"Yes","No" } ) == 2
+         Return ( 1 )
+      endif
+
+   ENDCASE
+
+   RETURN 0
+//----------------------------------------------------------------------//
+STATIC FUNCTION DispScreen()
+   Local nRow := 12, nCol := 28
+   Local cColor := "N/W"
+   Local nMaxCol := MaxCol()+1
+
+   DispBegin()
+
+   CLS
+   DispOutAt( 0, 0,padc( "Harbour GT - New Features", maxcol()+1 ), "N/GR*" )
+
+   // Contributed by Massimo Belgrano
+   DispOutAt( 2, 0, padc( "______  __             ______________________                        ",nMaxCol ), "W+/W" )
+   DispOutAt( 3, 0, padc( "___  / / /_____ ___________ /___________  _________    __  ____/____/",nMaxCol ), "W+/W" )
+   DispOutAt( 4, 0, padc( "__  /_/ /_  __ `/_  ___/_  __ \  __ \  / / /_  ___/    _  / __ __/   ",nMaxCol ), "W+/W" )
+   DispOutAt( 5, 0, padc( "_  __  / / /_/ /_  /   _  /_/ / /_/ / /_/ /_  /        / /_/ / _  /  ",nMaxCol ), "W+/W" )
+   DispOutAt( 6, 0, padc( "/_/ /_/  \__,_/ /_/    /_.___/\____/\__,_/ /_/         \____/  /_/   ",nMaxCol ), "W+/W" )
+
+   DispOutAt( ++nRow, nCol, "< F2 MarkCopy    Toggle >", cColor )
+   DispOutAt( ++nRow, nCol, "< F3 Resize      Toggle >", cColor )
+   DispOutAt( ++nRow, nCol, "< F4 Closable    Toggle >", cColor )
+   DispOutAt( ++nRow, nCol, "< F5 Palette L   Repeat >", cColor )
+   DispOutAt( ++nRow, nCol, "< F6 Palette D   Repeat >", cColor )
+   DispOutAt( ++nRow, nCol, "< F7 Palette By Index R >", cColor )
+   DispOutAt( ++nRow, nCol, "< F8 MarkCopy menu text >", cColor )
+   DispOutAt( ++nRow, nCol, "<    Click Other Window >", cColor )
+   DispOutAt( ++nRow, nCol, "<    Click X Button     >", cColor )
+#ifdef __GTWVG__
+   DispOutAt( ++nRow, nCol, "< F9 Run in SysTray     >", cColor )
+#endif
+   DispOutAt( ++nRow, nCol, "< F10 Open New Window   >", cColor )
+
+   DispOutAt( maxrow(), 0, Space( maxcol()+1 ), "N/G*" )
+
+   DispOutAt( 0, 0                  , "TL", "N/GR*" )
+   DispOutAt( 0, MaxCol() - 1       , "TR", "N/GR*" )
+   DispOutAt( MaxRow(), 0           , "BL", "N/G*"  )
+   DispOutAt( MaxRow(), MaxCol() - 1, "BR", "N/G*"  )
+
+   DispEnd()
+   RETURN NIL
+//----------------------------------------------------------------------//
+PROCEDURE HB_GTSYS()
+   REQUEST HB_GT_QTC_DEFAULT
+   RETURN
+//----------------------------------------------------------------------//
+FUNCTION SetPalette( nMode )
+   Local aPalette := Hb_GtInfo( HB_GTI_PALETTE )
+
+   static nR := 198
+   static nG := 198
+   static nB := 198
+
+   nR += iif( nMode == 0, -5, 5 )
+   nG += iif( nMode == 0, -5, 5 )
+   nB += iif( nMode == 0, -5, 5 )
+
+   // Change "W" to slightly gray everytime you press F5
+   //
+   aPalette[ 8 ] := RGB( nR, nG, nB )
+
+   Hb_GtInfo( HB_GTI_PALETTE, aPalette )
+   DispScreen()
+
+   RETURN NIL
+//----------------------------------------------------------------------//
+FUNCTION SetPaletteIndex()
+
+   Hb_GtInfo( HB_GTI_PALETTE, 8, RGB( 120, 200, 240 ) )
+   DispScreen()
+
+   RETURN NIL
+//----------------------------------------------------------------------//
+#define HB_GTS_NIM_ADD               0
+#define HB_GTS_NIM_MODIFY            1
+#define HB_GTS_NIM_DELETE            2
+
+FUNCTION RunInSysTray()
+   #ifdef __GTWVG__
+   Alert( "Please check your System Tray area after exiting this alert,"+;
+             ";then right click on the icon"+;
+                 ";displaying tooltip 'Harbour GT in SysTray' !" )
+
+   Hb_GtInfo( HB_GTI_SPEC, HB_GTS_SYSTRAYICON, { HB_GTS_NIM_ADD, HB_GTS_NIT_FILE, ;
+                "..\contrib\gtwvg\tests\vr_1.ico", "Harbour GT in SysTray" } )
+   #endif
+   RETURN NIL
+//----------------------------------------------------------------------//
+PROCEDURE thFunc()
+   #ifdef __GTWVG__
+   Local cTitle, oBrowse, lEnd, nKey, i, aStruct, pGT1, pGT, hWnd
+   Local aColor := { 'W+/N', 'W+/B', 'W+/G', 'W+/BG', 'W+/N*', 'W+/RB', 'N/W*', 'N/GR*' }
+
+   static nBrowser := 0
+   static nZx := 0
+   static nZy := 0
+
+   ErrorBlock( {|oErr| MyErrorSys( oErr ) } )
+
+   nBrowser++
+   nZx += 20
+   nZy += 20
+
+   /* allocate own GT driver */
+   hb_gtReload( 'WVT' )
+   Hb_GtInfo( HB_GTI_PALETTE, 8, RGB( 120, 200, 240 ) )
+
+   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' )+']' )
+
+   SetCursor( 0 )
+
+   nColorIndex++
+   if nColorIndex > len( aColor )
+      nColorIndex := 1
+   endif
+
+   nRows++
+   nCols += 2
+
+   SetMode( nRows,nCols )
+   SetColor( aColor[ nColorIndex ] )
+   Hb_GtInfo( HB_GTI_WINTITLE, cTitle )
+   CLS
+   Hb_GtInfo( HB_GTI_SETPOS_XY, nZx, nZy )
+
+   cTitle := 'New Window with '+ltrim( str( MaxRow() ) )+;
+                          ' Rows and '+ltrim( str( MaxCol() ) )+' Columns'
+   DispOutAt( 0, 0, padc( cTitle, maxcol()+1 ), 'N/GR*' )
+   cTitle := '<F11> Modal Dialog  <ReSize> <Maximize> <ESC>'
+   DispOutAt( MaxRow(), 0, padc( cTitle, maxcol()+1 ), 'W+/R*' )
+
+   use test shared
+   aStruct := DbStruct()
+
+   oBrowse := TBrowse():New( 1, 0, maxrow()-1, maxcol() )
+
+   oBrowse:ColSep        := " ³ "
+   oBrowse:HeadSep       := "ÄÂÄ"
+   oBrowse:GoTopBlock    := { || dbGoTop() }
+   oBrowse:GoBottomBlock := { || dbGoBottom() }
+   oBrowse:SkipBlock     := { | nSkip | dbSkipBlock( nSkip,oBrowse ) }
+
+   for i := 1 to len( aStruct )
+      oBrowse:AddColumn( TBColumnNew( aStruct[ i,1 ], BlockField( i ) ) )
+   next
+
+   oBrowse:configure()
+
+   lEnd := .f.
+   While !lEnd
+      oBrowse:ForceStable()
+
+      nKey := InKey( 0, INKEY_ALL )
+
+      if BrwHandleKey( oBrowse, nKey, @lEnd )
+         //
+      else
+         if nKey == HB_K_RESIZE
+            cTitle := 'New Window with '+ltrim( str( MaxRow() ) )+;
+                          ' Rows and '+ltrim( str( MaxCol() ) )+' Columns'
+            DispOutAt( 0, 0, padc( cTitle, maxcol()+1 ), 'N/GR*' )
+            cTitle := '<F11> Modal Dialog  <ReSize> <Maximize> <ESC>'
+            DispOutAt( MaxRow(), 0, padc( cTitle, maxcol()+1 ), 'W+/R*' )
+
+            oBrowse:nBottom := MaxRow()-1
+            oBrowse:nRight  := MaxCol()
+            oBrowse:Configure()
+            oBrowse:RefreshAll()
+
+         elseif nKey == K_F11
+            // Initialization Phase . Can be a Dialog Class
+            // LIKE in Xbase++:
+            // oWnd := gtDialog():New( oParent, oOwner, aSize, aPos, aPresParam, lVisible )
+            //
+            hWnd := hb_gtInfo( HB_GTI_WINHANDLE )
+
+            pGT1 := hb_gtCreate( 'WVT' )
+            pGT  := hb_gtSelect( pGT1 )
+            SetMode( 7,40 )
+            hb_gtInfo( HB_GTI_SETPARENT     , hWnd )
+            hb_gtInfo( HB_GTI_SETPOS_ROWCOL , 4, 8 )
+            hb_gtInfo( HB_GTI_WINTITLE      , 'Modal Dialog [ Row:4 Col:8 ]' )
+            hb_gtInfo( HB_GTI_RESIZABLE     , .F.  )
+
+            // Program Flow
+            SetColor( 'N/W' )
+            CLS
+            Alert( 'I am in Child Window', {'Good','Bad'} )
+
+            // Cleanup
+            pGT1 := NIL
+            hb_gtSelect( pGT )
+
+         elseif nKey == K_F12
+            pGT1 := NIL
+
+         endif
+      endif
+   end
+
+   DbCloseArea()
+
+   RETURN
+//----------------------------------------------------------------------//
+STATIC FUNCTION DbSkipBlock( n, oTbr )
+
+   LOCAL nSkipped := 0
+
+   if n == 0
+      DBSkip( 0 )
+
+   elseif n > 0
+      do while nSkipped != n .and. TBNext( oTbr )
+         nSkipped++
+      enddo
+   else
+      do while nSkipped != n .and. TBPrev( oTbr )
+         nSkipped--
+      enddo
+   endif
+
+   RETURN  nSkipped
+//-------------------------------------------------------------------//
+STATIC FUNCTION TBNext( oTbr )
+
+   LOCAL nSaveRecNum := recno()
+   LOCAL lMoved := .T.
+
+   if Eof()
+      lMoved := .F.
+   else
+      DBSkip( 1 )
+      if Eof()
+         lMoved := .F.
+         DBGoTo( nSaveRecNum )
+      endif
+   endif
+
+   RETURN lMoved
+//-------------------------------------------------------------------//
+STATIC FUNCTION TBPrev( oTbr )
+   LOCAL nSaveRecNum := Recno()
+   LOCAL lMoved := .T.
+
+   DBSkip( -1 )
+
+   if Bof()
+      DBGoTo( nSaveRecNum )
+      lMoved := .F.
+   endif
+
+   RETURN lMoved
+//-------------------------------------------------------------------//
+STATIC FUNCTION BlockField( i )
+   RETURN  {|| fieldget( i ) }
+//-------------------------------------------------------------------//
+STATIC FUNCTION BrwHandleKey( oBrowse, nKey, lEnd )
+   LOCAL lRet := .t.
+
+   do case
+   case nKey == K_ESC
+      lEnd := .t.
+
+   case nKey == K_ENTER
+      lEnd := .t.
+
+   case nKey == K_DOWN
+      oBrowse:Down()
+
+   case nKey == K_UP
+      oBrowse:Up()
+
+   case nKey == K_LEFT
+      oBrowse:Left()
+
+   case nKey == K_RIGHT
+      oBrowse:Right()
+
+   case nKey == K_PGDN
+      oBrowse:pageDown()
+
+   case nKey == K_PGUP
+      oBrowse:pageUp()
+
+   case nKey == K_CTRL_PGUP
+      oBrowse:goTop()
+
+   case nKey == K_CTRL_PGDN
+      oBrowse:goBottom()
+
+   case nKey == K_HOME
+      oBrowse:home()
+
+   case nKey == K_END
+      oBrowse:end()
+
+   case nKey == K_CTRL_LEFT
+      oBrowse:panLeft()
+
+   case nKey == K_CTRL_RIGHT
+      oBrowse:panRight()
+
+   case nKey == K_CTRL_HOME
+      oBrowse:panHome()
+
+   case nKey == K_CTRL_END
+      oBrowse:panEnd()
+
+   case nKey == K_MWBACKWARD
+      oBrowse:down()
+
+   case nKey == K_MWFORWARD
+      oBrowse:up()
+
+   otherwise
+      lRet := .f.
+
+   endcase
+   #endif
+   RETURN lRet
+//-------------------------------------------------------------------//
+PROCEDURE MyErrorSys( oError )
+
+   ? oError:Description
+   ? oError:args
+   ? oError:genCode
+   ? oError:operation
+
+   ? procname(1), procline(1)
+   ? procname(2), procline(2)
+   ? procname(3), procline(3)
+
+   do while inkey() <> 27
+   enddo
+
+   RETURN
+//----------------------------------------------------------------------//