From 3c36320751ae8ad3a1f5973ad6e1d76d98e9f52f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 28 Feb 2012 18:03:35 +0000
Subject: [PATCH] 2012-02-28 19:02 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbxbp/hbxbp.hbp   * contrib/hbxbp/hbxbp.hbc     * include
 hbqt.hbc instead of relative references to       hbqt sublib .hbcs. This
 means hbxbp now includes all       hbqt sublibs.

  * contrib/hbxbp/hbxbp.hbc
    * deleted reference to qtqtc.hbc.

  * contrib/hbide/hbide.hbp
    + removed relative path from .hbc references.
    * hbqt sublib reference replace with hbqt.hbc

  * contrib/hbxbp/hbxbp.hbp
  * contrib/hbide/hbide.hbp
    - deleted -prgflag=-D_HB_TR_NOALWAYS_
---
 harbour/ChangeLog               | 18 ++++++++++++++++++
 harbour/contrib/hbide/hbide.hbp | 10 ++++------
 harbour/contrib/hbxbp/hbxbp.hbc |  4 +---
 harbour/contrib/hbxbp/hbxbp.hbp |  5 +----
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6d33d22ff7..48142bbe65 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,24 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-02-28 19:02 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbxbp/hbxbp.hbp
+  * contrib/hbxbp/hbxbp.hbc
+    * include hbqt.hbc instead of relative references to
+      hbqt sublib .hbcs. This means hbxbp now includes all
+      hbqt sublibs.
+
+  * contrib/hbxbp/hbxbp.hbc
+    * deleted reference to qtqtc.hbc.
+
+  * contrib/hbide/hbide.hbp
+    + removed relative path from .hbc references.
+    * hbqt sublib reference replace with hbqt.hbc
+
+  * contrib/hbxbp/hbxbp.hbp
+  * contrib/hbide/hbide.hbp
+    - deleted -prgflag=-D_HB_TR_NOALWAYS_
+
 2012-02-28 16:45 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/sddpg/sddpg.hbp
   * contrib/sddpg/sddpg.hbc
diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp
index e3b3deee14..3dfc55d569 100644
--- a/harbour/contrib/hbide/hbide.hbp
+++ b/harbour/contrib/hbide/hbide.hbp
@@ -11,8 +11,6 @@
 
 -w3 -es2
 
--prgflag=-D_HB_TR_NOALWAYS_
-
 -icon={allwin}hbide.ico
 
 #-instfile={win&HB_WITH_QT&!(HB_WITH_QT='no')}${HB_WITH_QT}/../bin/libgcc_s_dw2-1.dll
@@ -21,11 +19,11 @@
 #-instfile={win&HB_WITH_QT&!(HB_WITH_QT='no')}${HB_WITH_QT}/../bin/QtGui4.dll
 #-instfile={win&HB_WITH_QT&!(HB_WITH_QT='no')}${HB_WITH_QT}/../bin/QtNetwork4.dll
 
-../hbxbp/hbxbp.hbc
-../hbqt/hbqtnetwork.hbc
-../hbformat/hbformat.hbc
+hbxbp.hbc
+hbqt.hbc
+hbformat.hbc
 # TODO: Need to set 'HB_DYNLOAD_RDDADS=yes' for this to be enabled
-../rddads/rddads.hbc{HB_DYNLOAD_RDDADS}
+rddads.hbc{HB_DYNLOAD_RDDADS}
 
 idemain.prg
 ideobject.prg
diff --git a/harbour/contrib/hbxbp/hbxbp.hbc b/harbour/contrib/hbxbp/hbxbp.hbc
index 4a69bca59a..d82ec60a30 100644
--- a/harbour/contrib/hbxbp/hbxbp.hbc
+++ b/harbour/contrib/hbxbp/hbxbp.hbc
@@ -6,6 +6,4 @@ incpaths=.
 
 libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 
-libs=../hbqt/hbqtcore.hbc
-libs=../hbqt/hbqtgui.hbc
-libs=../hbqt/gtqtc.hbc
+libs=hbqt.hbc
diff --git a/harbour/contrib/hbxbp/hbxbp.hbp b/harbour/contrib/hbxbp/hbxbp.hbp
index c82bc71e8e..77976418e6 100644
--- a/harbour/contrib/hbxbp/hbxbp.hbp
+++ b/harbour/contrib/hbxbp/hbxbp.hbp
@@ -9,10 +9,7 @@
 
 -w3 -es2
 
--prgflag=-D_HB_TR_NOALWAYS_
-
-../hbqt/hbqtcore.hbc
-../hbqt/hbqtgui.hbc
+hbqt.hbc
 
 -instfile=inc:appevent.ch
 -instfile=inc:gra.ch