diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7de78db192..e2261564f6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-10 22:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbqt/tests/demoqt.prg
+    ! Fixed: X click or "Exit" option was not working.
+
 2010-08-10 09:58 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/hbqt.ch
 
diff --git a/harbour/contrib/hbqt/tests/demoqt.prg b/harbour/contrib/hbqt/tests/demoqt.prg
index 3cda1ac274..27f94faa4b 100644
--- a/harbour/contrib/hbqt/tests/demoqt.prg
+++ b/harbour/contrib/hbqt/tests/demoqt.prg
@@ -85,6 +85,7 @@
 
 #include "common.ch"
 
+
 REQUEST HB_QT
 
 STATIC s_qApp
@@ -160,7 +161,8 @@ HB_TRACE( HB_TR_ALWAYS, ( "-----------------b-----------------" ) )
    aList  := Build_ListBox( oDA, { 310,240 }, { 150, 100 } )
 
    oWnd:installEventFilter( s_events )
-   QT_EVENTS_CONNECT( s_events, oWnd, 6, {|e| My_Events( e ) } )
+   QT_EVENTS_CONNECT( s_events, oWnd,  6, {|e| My_Events( e ) } )
+   QT_EVENTS_CONNECT( s_events, oWnd, 19, {|| s_qApp:quit() } )
 
    oWnd:Show()
 
@@ -199,7 +201,7 @@ PROCEDURE ExecOneMore()
    Local oLabel, oBtn, oDA, oWnd, oProg, oSBar
    LOCAL aMenu, aTool, aGrid, aTabs, aList, oEventLoop
    LOCAL lExit := .f.
-
+   
    oWnd := QMainWindow():new()
 
    oWnd:setMouseTracking( .t. )
@@ -258,7 +260,7 @@ STATIC FUNCTION Build_MenuBar( oWnd )
    oMenu1:addSeparator()
    QT_SLOTS_CONNECT( s_slots,  oMenu1:addAction_1( "save.png", "&Save" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save", w, l ) } )
    oMenu1:addSeparator()
-   QT_SLOTS_CONNECT( s_slots,  oMenu1:addAction( "E&xit" ), QT_EVE_TRIGGERED_B, {|w,l| w := w, l := l, MsgInfo( "Exit ?" ) } )
+   QT_SLOTS_CONNECT( s_slots,  oMenu1:addAction( "E&xit" ), QT_EVE_TRIGGERED_B, {|| s_qApp:quit() } )
    oMenuBar:addMenu( oMenu1 )
 
    oMenu2 := QMenu():new()