diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8f2dbb2dc2..d49af8b613 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-17 07:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/hbqt_common.hbm
+  * contrib/hbqt/detect.mk
+    + Enabled for mingw64.
+
+  * src/rtl/inkey.c
+    - Deleted recently added HB_KEYLAST()/HB_KEYNEXT().
+    - Deleted dirty/hidden parameter extension from LASTKEY().
+    - Deprecated NEXTKEY() dirty/hidden extension by HB_LEGACY_LEVEL3.
+
 2010-06-17 00:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * tests/wvtext.prg
     + Extended with tests for row resize.
@@ -23,6 +33,7 @@
 
   * config/global.mk
     ! Typo after last changes making HB_BUILD_PKG ineffective.
+
   * INSTALL
     * Minor.
 
diff --git a/harbour/contrib/hbqt/detect.mk b/harbour/contrib/hbqt/detect.mk
index 1f26d470e0..e207979706 100644
--- a/harbour/contrib/hbqt/detect.mk
+++ b/harbour/contrib/hbqt/detect.mk
@@ -14,7 +14,7 @@ _DET_DSP_NAME := qt
 _DET_VAR_INC_ := HB_INC_QT
 _DET_VAR_HAS_ := HB_HAS_QT
 _DET_FLT_PLAT := !dos
-_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
+_DET_FLT_COMP := !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
 _DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
 _DET_INC_HEAD := /QtCore/qglobal.h
 include $(TOP)$(ROOT)config/detfun.mk
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index 87796a3abe..580776a979 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -8,7 +8,7 @@
 
 -w3 -es2
 
--stop{dos|mingw64|watcom|bcc|pocc|pocc64|poccarm|msvcia64}
+-stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}
 
 -plugin=plug_moc.prg
 
diff --git a/harbour/src/rtl/inkey.c b/harbour/src/rtl/inkey.c
index 76ec91771f..e3c4da9934 100644
--- a/harbour/src/rtl/inkey.c
+++ b/harbour/src/rtl/inkey.c
@@ -194,7 +194,7 @@ HB_FUNC( HB_KEYPUT )
       HB_SIZE ulIndex;
       HB_SIZE ulElements = hb_arrayLen( pArray );
 
-      for( ulIndex = 1; ulIndex <= ulElements; ulIndex++ )
+      for( ulIndex = 1; ulIndex <= ulElements; ++ulIndex )
       {
          HB_TYPE type = hb_arrayGetType( pArray, ulIndex );
 
@@ -226,7 +226,7 @@ HB_FUNC( HB_KEYINS )
       HB_SIZE ulIndex;
       HB_SIZE ulElements = hb_arrayLen( pArray );
 
-      for( ulIndex = 1; ulIndex <= ulElements; ulIndex++ )
+      for( ulIndex = 1; ulIndex <= ulElements; ++ulIndex )
       {
          HB_TYPE type = hb_arrayGetType( pArray, ulIndex );
 
@@ -244,24 +244,17 @@ HB_FUNC( HB_KEYINS )
 
 HB_FUNC( NEXTKEY )
 {
-   /* TOFIX: Dirty extension. Clipper accepts no parameter here. */
+#if defined( HB_LEGACY_LEVEL3 )
+   /* NOTE: Dirty extension. Clipper accepts no parameter here. Deprecated */
    hb_retni( hb_inkeyNext( HB_ISNUM( 1 ) ? hb_parni( 1 ) : hb_setGetEventMask() ) );
+#else
+   hb_retni( hb_inkeyNext( hb_setGetEventMask() ) );
+#endif
 }
 
 HB_FUNC( LASTKEY )
 {
-   /* TOFIX: Dirty extension. Clipper accepts no parameter here. */
-   hb_retni( hb_inkeyLast( HB_ISNUM( 1 ) ? hb_parni( 1 ) : INKEY_ALL ) );
-}
-
-HB_FUNC( HB_KEYNEXT )
-{
-   hb_retni( hb_inkeyNext( HB_ISNUM( 1 ) ? hb_parni( 1 ) : hb_setGetEventMask() ) );
-}
-
-HB_FUNC( HB_KEYLAST )
-{
-   hb_retni( hb_inkeyLast( HB_ISNUM( 1 ) ? hb_parni( 1 ) : INKEY_ALL ) );
+   hb_retni( hb_inkeyLast( INKEY_ALL ) );
 }
 
 HB_FUNC( HB_SETLASTKEY )