diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7eaed989b1..0304a14c2c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-14 09:03 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * harbour/contrib/gtqtc/gtqtc.cpp
+  * harbour/contrib/gtqtc/gtqtc.h
+  * harbour/contrib/gtqtc/moc_gtqtc.cpp
+  * harbour/contrib/gtqtc/tests/demoqtc.prg
+    ! Just here and there.
+
 2009-06-14 14:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/gtwvg/wvgwin.c
     ! fixed wrongly used & operator
diff --git a/harbour/contrib/gtqtc/gtqtc.cpp b/harbour/contrib/gtqtc/gtqtc.cpp
index 43a138bdc2..670a6112e4 100644
--- a/harbour/contrib/gtqtc/gtqtc.cpp
+++ b/harbour/contrib/gtqtc/gtqtc.cpp
@@ -61,24 +61,24 @@
 
 #include "gtqtc.h"
 
-static QApplication * app      = NULL;
-static bool           hbqtinit = false;
-
 #define WM_MY_UPDATE_CARET         1700
 
-static int           s_GtId;
-static HB_GT_FUNCS   SuperTable;
-#define HB_GTSUPER   (&SuperTable)
-#define HB_GTID_PTR  (&s_GtId)
+static  QApplication *  app      = NULL;
+static  bool            hbqtinit = false;
+
+static  int             s_GtId;
+static  HB_GT_FUNCS     SuperTable;
+#define HB_GTSUPER      (&SuperTable)
+#define HB_GTID_PTR     (&s_GtId)
 
 #define HB_GTWVT_GET(p) ( ( PHB_GTWVT ) HB_GTLOCAL( p ) )
 
-static HB_CRITICAL_NEW( s_wvtMtx );
+static  HB_CRITICAL_NEW( s_wvtMtx );
 #define HB_WVT_LOCK     hb_threadEnterCriticalSection( &s_wvtMtx );
 #define HB_WVT_UNLOCK   hb_threadLeaveCriticalSection( &s_wvtMtx );
 
-static PHB_GTWVT  s_wvtWindows[ WVT_MAX_WINDOWS ];
-static int        s_wvtCount = 0;
+static  PHB_GTWVT       s_wvtWindows[ WVT_MAX_WINDOWS ];
+static  int             s_wvtCount = 0;
 
 /*----------------------------------------------------------------------*/
 #if 0
diff --git a/harbour/contrib/gtqtc/gtqtc.h b/harbour/contrib/gtqtc/gtqtc.h
index 53488c93d4..c506b52ca9 100644
--- a/harbour/contrib/gtqtc/gtqtc.h
+++ b/harbour/contrib/gtqtc/gtqtc.h
@@ -55,7 +55,6 @@
 
 #define HB_GT_NAME  QTC
 
-#include <qglobal.h>
 #include <QtGui/QtGui>
 #include <QtCore/QObject>
 #include <QtCore/QList>
@@ -81,25 +80,17 @@
 #include "hbvm.h"
 #include "hbthread.h"
 
-#define WVT_CHAR_QUEUE_SIZE       4096 //  128
+#define WVT_CHAR_QUEUE_SIZE        4096 //  128
 #define WVT_MAX_TITLE_SIZE         128
 #define WVT_MAX_ROWS               256
 #define WVT_MAX_COLS               256
 #define WVT_MAX_WINDOWS            256
-#if defined( HB_OS_WIN_CE )
-#  define WVT_DEFAULT_ROWS          15
-#  define WVT_DEFAULT_COLS          50
-#  define WVT_DEFAULT_FONT_HEIGHT   12
-#  define WVT_DEFAULT_FONT_WIDTH     8
-#else
-#  define WVT_DEFAULT_ROWS          25
-#  define WVT_DEFAULT_COLS          80
-#  define WVT_DEFAULT_FONT_HEIGHT   20
-#  define WVT_DEFAULT_FONT_WIDTH    10
-#endif
-#define WVT_DEFAULT_FONT_NAME    "Courier New"
+#define WVT_DEFAULT_ROWS           25
+#define WVT_DEFAULT_COLS           80
+#define WVT_DEFAULT_FONT_HEIGHT    20
+#define WVT_DEFAULT_FONT_WIDTH     10
+#define WVT_DEFAULT_FONT_NAME      "Courier New"
 
-//#define QQRGB( r,g,b )  ( ( QRgb ) ( ( r ) + ( g * 256 ) + ( b * 256 * 256 ) ) )
 #define QQRGB( r,g,b )  ( qRgb( r,g,b ) )
 
 #define C_BLACK          RGB( 0x0 ,0x0 ,0x0  )
diff --git a/harbour/contrib/gtqtc/moc_gtqtc.cpp b/harbour/contrib/gtqtc/moc_gtqtc.cpp
index 11f3ca428d..5503251e4e 100644
--- a/harbour/contrib/gtqtc/moc_gtqtc.cpp
+++ b/harbour/contrib/gtqtc/moc_gtqtc.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** Meta object code from reading C++ file 'gtqtc.h'
 **
-** Created: Sun Apr 26 08:56:14 2009
+** Created: Sat May 30 12:14:19 2009
 **      by: The Qt Meta Object Compiler version 61 (Qt 4.5.0)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/harbour/contrib/gtqtc/tests/demoqtc.prg b/harbour/contrib/gtqtc/tests/demoqtc.prg
index b72581c55b..c133ea67cf 100644
--- a/harbour/contrib/gtqtc/tests/demoqtc.prg
+++ b/harbour/contrib/gtqtc/tests/demoqtc.prg
@@ -441,17 +441,25 @@ STATIC FUNCTION BrwHandleKey( oBrowse, nKey, lEnd )
    endcase
 
    RETURN lRet
-//-------------------------------------------------------------------//
+/*----------------------------------------------------------------------*/
+
+FUNCTION Qtc_Out( cMsg )
+
+   RETURN Qtc_OutputDebugString( cMsg )
+
+/*----------------------------------------------------------------------*/
+
 PROCEDURE MyErrorSys( oError )
 
-   ? oError:Description
-   ? oError:args
-   ? oError:genCode
-   ? oError:operation
+   //Qtc_Out( oError:Description )
+   Qtc_Out( oError:args )
+   Qtc_Out( oError:genCode )
+   Qtc_Out( oError:operation )
 
-   ? procname(1), procline(1)
-   ? procname(2), procline(2)
-   ? procname(3), procline(3)
+   Qtc_Out( procname( 1 ) )
+   Qtc_Out( str( procline( 1 ) ) )
+   Qtc_Out( procname( 2 ) )
+   Qtc_Out( str( procline( 2 ) ) )
 
    RETURN
 //----------------------------------------------------------------------//