diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6a41a3eac4..c4058375b8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,23 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-23 11:53 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/hbqt/tests/hbqt.hbp
+    * Minor adjustment to supc++ lib inclusion filter.
+
+  - contrib/gtqtc/tests/hbqt.hbp
+  + contrib/gtqtc/tests/gtqtc.hbp
+    - Removed .hbp with wrong name. This file also contained
+      local, environment dependent QT libpath.
+      Please don't add such lines to SVN !!
+      Instead use a local .hbp file which points to the QT path
+      in your environment:
+      --- qt_path.hbp
+      {win}libpaths=C:\devl\Qt\2009.01\qt\lib
+      --- (don't commit this file, keep it local !)
+      or, add the same line to your local hbmk.cfg file.
+    + Added new .hbp file with multiplatform content.
+
 2009-04-23 10:26 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbexprb.c
     + added support for indirect (by macro or some other expression)
@@ -18,7 +35,7 @@
   * harbour/contrib/gtqtc/gtqtc.h
   * harbour/contrib/gtqtc/moc_gtqtc.cpp
     ! IMPLEMENTED : MT protocol. GTQTC now responds to it but
-                    there are still glitches. I think this is the 
+                    there are still glitches. I think this is the
                     result of improper implementation of C++ code
                     and QT's underlying SIGNAL/SLOT mechanism.
     ! FIXED : SetMode()
@@ -31,18 +48,18 @@
 
   * harbour/contrib/gtqtc/tests/demoqtc.prg
   * harbour/contrib/gtqtc/tests/wvtext.prg
-    ! GTQTC is now MT compliant. You may experience bumps 
+    ! GTQTC is now MT compliant. You may experience bumps
       as QT event loop has not been adapted to Harbour's completely.
-      There are glitches which are under investigations, but 
+      There are glitches which are under investigations, but
       proof of fruitation is there. Play with wvtext.exe, Press F10
       for new window, please copy /tests/tests.dbf to this folder first.
       Try to open many windows.
       NOTE: You will have to click main window twice to make it
       respond to key events. Still I do not know why it does not
       get the keyboard focus with one click.
-      Try to close the windows with ESC or clicking on the X button.  
+      Try to close the windows with ESC or clicking on the X button.
 
-   /*  I NEED YOUR INTEREST AND EFFORTS TO MAKE THIS PROJECT A SUCCESS    */ 
+   /*  I NEED YOUR INTEREST AND EFFORTS TO MAKE THIS PROJECT A SUCCESS    */
    /*                                                                     */
    /*  Przemek, please review the code and guide me what way it should go */
 
diff --git a/harbour/contrib/gtqtc/tests/gtqtc.hbp b/harbour/contrib/gtqtc/tests/gtqtc.hbp
new file mode 100644
index 0000000000..e383a61d2f
--- /dev/null
+++ b/harbour/contrib/gtqtc/tests/gtqtc.hbp
@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+
+{mingw|(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
+{darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
+{darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
+# static libs
+#libs=QtCore QtGui QtNetwork QtWebKit
+gui=yes
+gt=gtqtc
+# optional
+mt=yes
diff --git a/harbour/contrib/gtqtc/tests/hbqt.hbp b/harbour/contrib/gtqtc/tests/hbqt.hbp
deleted file mode 100644
index 0da6684b1e..0000000000
--- a/harbour/contrib/gtqtc/tests/hbqt.hbp
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# $Id$
-#
-
-{mingw}libs=supc++
-
-gt=gtqtc
-gui=yes
-mt=yes
-
-{win}libpaths=C:\Qt\2009.01\Qt\Lib
-
-{win}libs=gtqtc xhb hbmzip
-{win}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
-
-
diff --git a/harbour/contrib/hbqt/tests/hbqt.hbp b/harbour/contrib/hbqt/tests/hbqt.hbp
index a11cb92715..39fae53f42 100644
--- a/harbour/contrib/hbqt/tests/hbqt.hbp
+++ b/harbour/contrib/hbqt/tests/hbqt.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-{mingw|gcc}libs=supc++
+{mingw|(gcc&(linux|darwin))}libs=supc++
 libs=hbqt
 {!darwin}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
 {darwin}libs=/Library/Frameworks/QtCore.framework/QtCore