diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 32e0bce3c5..5a73dbe66a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-16 19:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/hbqts.hbc
+    ! Fixed to include supc++ for gcc targets.
+
+  * contrib/hbqt/hbqt.hbc
+  * contrib/gtqtc/gtqtc.hbc
+    % Simplified inclusion logic of supc++.
+
+  * contrib/gtqtc/gtqtc.hbc
+  + contrib/gtqtc/gtqtcs.hbc
+  + contrib/gtqtc/gtqtcs
+  + contrib/gtqtc/gtqtcs/Makefile
+  * contrib/gtqtc/Makefile
+    + HB_QT_STATIC now works the same way as for hbqt.
+
 2009-09-16 17:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbwin/legacy.prg
     + Added operator overloading to TOLEAUTO compatibility class.
diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile
index abaf480ded..1250529ffd 100644
--- a/harbour/contrib/gtqtc/Makefile
+++ b/harbour/contrib/gtqtc/Makefile
@@ -6,11 +6,7 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifeq ($(HB_QT_STATIC),)
-   LIBNAME := gtqtc
-else
-   LIBNAME := gtqtcs
-endif
+LIBNAME := gtqtc
 
 CPP_SOURCES := \
    gtqtc.cpp \
@@ -52,13 +48,15 @@ ifneq ($(HB_HAS_QT),)
       HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
    endif
 
-   ifneq ($(HB_QT_STATIC),)
-      HB_CFLAGS += -DQT_NODLL
-   endif
-
    include $(TOP)$(ROOT)config/header.mk
    include $(TOP)$(ROOT)config/lib.mk
 
+   ifneq ($(filter $(HB_PLATFORM),win wce),)
+      ifneq ($(HB_QT_STATIC),)
+         DIRS += gtqtcs
+         include $(TOP)$(ROOT)config/dir.mk
+      endif
+   endif
 else
    HB_SKIP_REASON := $(_DET_RES_TEXT)
    include $(TOP)$(ROOT)config/none.mk
diff --git a/harbour/contrib/gtqtc/gtqtc.hbc b/harbour/contrib/gtqtc/gtqtc.hbc
index a978b81f8e..0ca8e38a44 100644
--- a/harbour/contrib/gtqtc/gtqtc.hbc
+++ b/harbour/contrib/gtqtc/gtqtc.hbc
@@ -4,16 +4,14 @@
 
 {allwin}libpaths=${HB_DIR_QT}\lib
 
-{allwin&!HB_QT_STATIC}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
-{allwin&HB_QT_STATIC}libs=QtCore QtGui QtNetwork QtWebKit
+libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
 {linux}libs=QtCore QtGui QtNetwork QtWebKit
 {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
-{mingw|mingwce|(gcc&(linux|darwin))}libs=supc++
+{allgcc}libs=supc++
 gui=yes
-{!HB_QT_STATIC}gt=gtqtc
-{HB_QT_STATIC}gt=gtqtcs
+gt=gtqtc
 # optional
 mt=yes
diff --git a/harbour/contrib/gtqtc/gtqtcs.hbc b/harbour/contrib/gtqtc/gtqtcs.hbc
new file mode 100644
index 0000000000..8bf0551847
--- /dev/null
+++ b/harbour/contrib/gtqtc/gtqtcs.hbc
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+{allwin}libpaths=${HB_DIR_QT}\lib
+
+libs=QtCore QtGui QtNetwork QtWebKit
+{allgcc}libs=supc++
+gui=yes
+gt=gtqtcs
+# optional
+mt=yes
diff --git a/harbour/contrib/gtqtc/gtqtcs/Makefile b/harbour/contrib/gtqtc/gtqtcs/Makefile
new file mode 100644
index 0000000000..d7e5d75405
--- /dev/null
+++ b/harbour/contrib/gtqtc/gtqtcs/Makefile
@@ -0,0 +1,61 @@
+#
+# $Id$
+#
+
+ROOT := ../../../
+
+include $(TOP)$(ROOT)config/global.mk
+
+vpath %.cpp ../
+vpath %.prg ../
+
+LIBNAME := gtqtcs
+
+CPP_SOURCES := \
+   gtqtc.cpp \
+   moc_gtqtc.cpp \
+
+PRG_HEADERS := \
+   hbgtqtc.ch
+
+_DET_DSP_NAME := qt
+_DET_VAR_INC_ := HB_INC_QT
+_DET_VAR_HAS_ := HB_HAS_QT
+_DET_FLT_PLAT := !dos !os2
+_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm
+_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
+_DET_INC_HEAD := /Qt/qglobal.h
+include $(TOP)$(ROOT)config/detfun.mk
+
+_QT_DARWIN :=
+ifeq ($(HB_PLATFORM),darwin)
+   ifeq ($(HB_HAS_QT),)
+      _DET_DSP_NAME := qt
+      _DET_VAR_INC_ := HB_INC_QT
+      _DET_VAR_HAS_ := HB_HAS_QT
+      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Versions/4/Headers
+      _DET_INC_HEAD := /QtCore
+      include $(TOP)$(ROOT)config/detfun.mk
+      _QT_DARWIN := yes
+   endif
+endif
+
+ifneq ($(HB_HAS_QT),)
+
+   ifeq ($(_QT_DARWIN),yes)
+      HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+   else
+      HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+   endif
+
+   HB_CFLAGS += -DQT_NODLL
+
+   include $(TOP)$(ROOT)config/header.mk
+   include $(TOP)$(ROOT)config/lib.mk
+else
+   HB_SKIP_REASON := $(_DET_RES_TEXT)
+   include $(TOP)$(ROOT)config/none.mk
+endif
diff --git a/harbour/contrib/hbqt/hbqt.hbc b/harbour/contrib/hbqt/hbqt.hbc
index 76313f94dd..963497ab5d 100644
--- a/harbour/contrib/hbqt/hbqt.hbc
+++ b/harbour/contrib/hbqt/hbqt.hbc
@@ -14,6 +14,6 @@ libs=hbqt
 {darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
 {darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
 {darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
-{mingw|mingwce|(gcc&(linux|darwin))}libs=supc++
+{allgcc}libs=supc++
 gui=yes
 gt=gtnul
diff --git a/harbour/contrib/hbqt/hbqts.hbc b/harbour/contrib/hbqt/hbqts.hbc
index 4c372980a0..4f76066668 100644
--- a/harbour/contrib/hbqt/hbqts.hbc
+++ b/harbour/contrib/hbqt/hbqts.hbc
@@ -9,5 +9,6 @@ incpaths=.
 libs=hbqts
 {win}libs=version shlwapi
 {allwin}libs=QtCore QtGui QtNetwork QtWebKit
+{allgcc}libs=supc++
 gui=yes
 gt=gtnul