2010-08-02 02:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/make.hbs
    + Make it capable to build project dependencies which are not on the
      central project list. (this feature is used with hbqt)
    + Added -shl to hbmk2 build calls.

  * utils/hbmk2/hbmk2.prg
    + Added -shl option to show sub-project level in every output line.
    + Added experimental -hbcontainer target mode, which is virtual target,
      it won't create anything. Name not finalized yet.
    + Normalizing some more paths.
    ! Fixed not include the same plugin twice.
    ! Some internal fixes to -hb<target> option handling. Could have caused
      problems in rare situations.
    % Minor optimizations.

  * contrib/hbqt/utils/hbqtgen.prg
    * Changed to generate hbqt.h header references without relative dir, so it
      can now be freely solved using header dir options at build time.

  - contrib/hbqt/hbmk2_plugin_qt.hbs
  + contrib/hbqt/hbqt_hbmk2_plugin.hbs
  * contrib/hbqt/hbqt_common.hbc
  * contrib/hbqt/hbqt_common.hbm
    * Renamed.

  * contrib/hbqt/qtcore/hbqtcore.hbc
  * contrib/hbqt/qtgui/hbqtgui.hbc
  * contrib/hbqt/qtnetwork/hbqtnetwork.hbc
    ! Readded previously deleted trick which is required for
      successful dynlib link.

  * contrib/hbplist
  * contrib/hbqt/hbqt.hbp
    + Modified how container project is defined.
    * Now main container subproject is listed in central project list file.

  * contrib/hbqt/hbqt_common.hbc
  * contrib/hbqt/qtgui/hbqtgui.hbp
    - Moved -gui/-gtnul options inside hbqtgui.

  * contrib/hbqt/hbqt_common.hbm
    + Added hbqt root dir as header dir.

  * contrib/hbqt/utils/qtcore.qtp
  * contrib/hbqt/utils/qtgui.qtp
  * contrib/hbqt/utils/qtnetwork.qtp
  * contrib/hbqt/hbqt_common.hbm
  * contrib/hbqt/qtcore/hbqtcore.hbp
  * contrib/hbqt/qtcore/hbqtcores.hbp
  - contrib/hbqt/qtcore/*
  + contrib/hbqt/qtcore/g
  + contrib/hbqt/qtcore/g/*
  * contrib/hbqt/qtgui/hbqtgui.hbp
  * contrib/hbqt/qtgui/hbqtguis.hbp
  - contrib/hbqt/qtgui/*
  + contrib/hbqt/qtgui/g
  + contrib/hbqt/qtgui/g/*
  * contrib/hbqt/qtnetwork/hbqtnetwork.hbp
  * contrib/hbqt/qtnetwork/hbqtnetworks.hbp
  - contrib/hbqt/qtnetwork/*
  + contrib/hbqt/qtnetwork/g
  + contrib/hbqt/qtnetwork/g/*
    * Moved generated sources inside 'g' subdir.
    * Sources regenerated.

  - contrib/hbqt/hbqt_base.cpp
  - contrib/hbqt/hbqt_destruct.cpp
  - contrib/hbqt/hbqt_hbevents.cpp
  - contrib/hbqt/hbqt_hbevents.h
  - contrib/hbqt/hbqt_hbslots.cpp
  - contrib/hbqt/hbqt_hbslots.h
  - contrib/hbqt/hbqt_misc.prg
  - contrib/hbqt/hbqt_utils.cpp
  + contrib/hbqt/qtcore/hbqt_base.cpp
  + contrib/hbqt/qtcore/hbqt_destruct.cpp
  + contrib/hbqt/qtcore/hbqt_hbevents.cpp
  + contrib/hbqt/qtcore/hbqt_hbevents.h
  + contrib/hbqt/qtcore/hbqt_hbslots.cpp
  + contrib/hbqt/qtcore/hbqt_hbslots.h
  + contrib/hbqt/qtcore/hbqt_misc.prg
  + contrib/hbqt/qtcore/hbqt_utils.cpp
  * contrib/hbqt/qtcore/hbqtcore.hbm
    * Moved hbqtcore files to their own component subdir.

  - contrib/hbqt/hbqt_errorsys.prg
  - contrib/hbqt/hbqt_hbqabstractitemmodel.cpp
  - contrib/hbqt/hbqt_hbqabstractitemmodel.h
  - contrib/hbqt/hbqt_hbqmainwindow.cpp
  - contrib/hbqt/hbqt_hbqmainwindow.h
  - contrib/hbqt/hbqt_hbqplaintextedit.cpp
  - contrib/hbqt/hbqt_hbqplaintextedit.h
  - contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
  - contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
  - contrib/hbqt/hbqt_hbqtableview.cpp
  - contrib/hbqt/hbqt_hbqtableview.h
  - contrib/hbqt/THbQtUI.prg
  + contrib/hbqt/qtgui/hbqt_errorsys.prg
  + contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
  + contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h
  + contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp
  + contrib/hbqt/qtgui/hbqt_hbqmainwindow.h
  + contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
  + contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
  + contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp
  + contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h
  + contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
  + contrib/hbqt/qtgui/hbqt_hbqtableview.h
  + contrib/hbqt/qtgui/THbQtUI.prg
  * contrib/hbqt/qtgui/hbqtgui.hbm
    * Moved hbqtgui files to their own component subdir.

  - contrib/hbqt/qtdesigner/hbqtdesigner.qtp
  - contrib/hbqt/qtwebkit/hbqtwebkit.qtp
  + contrib/hbqt/utils/qtdesigner.qtp
  + contrib/hbqt/utils/qtwebkit.qtp
    * Moved .qtp files into utils subdir.

harbour/ChangeLog

@@ -16,6 +16,124 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-02 02:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+    + Make it capable to build project dependencies which are not on the
+      central project list. (this feature is used with hbqt)
+    + Added -shl to hbmk2 build calls.
+
+  * utils/hbmk2/hbmk2.prg
+    + Added -shl option to show sub-project level in every output line.
+    + Added experimental -hbcontainer target mode, which is virtual target,
+      it won't create anything. Name not finalized yet.
+    + Normalizing some more paths.
+    ! Fixed not include the same plugin twice.
+    ! Some internal fixes to -hb<target> option handling. Could have caused
+      problems in rare situations.
+    % Minor optimizations.
+
+  * contrib/hbqt/utils/hbqtgen.prg
+    * Changed to generate hbqt.h header references without relative dir, so it
+      can now be freely solved using header dir options at build time.
+
+  - contrib/hbqt/hbmk2_plugin_qt.hbs
+  + contrib/hbqt/hbqt_hbmk2_plugin.hbs
+  * contrib/hbqt/hbqt_common.hbc
+  * contrib/hbqt/hbqt_common.hbm
+    * Renamed.
+
+  * contrib/hbqt/qtcore/hbqtcore.hbc
+  * contrib/hbqt/qtgui/hbqtgui.hbc
+  * contrib/hbqt/qtnetwork/hbqtnetwork.hbc
+    ! Readded previously deleted trick which is required for
+      successful dynlib link.
+
+  * contrib/hbplist
+  * contrib/hbqt/hbqt.hbp
+    + Modified how container project is defined.
+    * Now main container subproject is listed in central project list file.
+
+  * contrib/hbqt/hbqt_common.hbc
+  * contrib/hbqt/qtgui/hbqtgui.hbp
+    - Moved -gui/-gtnul options inside hbqtgui.
+
+  * contrib/hbqt/hbqt_common.hbm
+    + Added hbqt root dir as header dir.
+
+  * contrib/hbqt/utils/qtcore.qtp
+  * contrib/hbqt/utils/qtgui.qtp
+  * contrib/hbqt/utils/qtnetwork.qtp
+  * contrib/hbqt/hbqt_common.hbm
+  * contrib/hbqt/qtcore/hbqtcore.hbp
+  * contrib/hbqt/qtcore/hbqtcores.hbp
+  - contrib/hbqt/qtcore/*
+  + contrib/hbqt/qtcore/g
+  + contrib/hbqt/qtcore/g/*
+  * contrib/hbqt/qtgui/hbqtgui.hbp
+  * contrib/hbqt/qtgui/hbqtguis.hbp
+  - contrib/hbqt/qtgui/*
+  + contrib/hbqt/qtgui/g
+  + contrib/hbqt/qtgui/g/*
+  * contrib/hbqt/qtnetwork/hbqtnetwork.hbp
+  * contrib/hbqt/qtnetwork/hbqtnetworks.hbp
+  - contrib/hbqt/qtnetwork/*
+  + contrib/hbqt/qtnetwork/g
+  + contrib/hbqt/qtnetwork/g/*
+    * Moved generated sources inside 'g' subdir.
+    * Sources regenerated.
+
+  - contrib/hbqt/hbqt_base.cpp
+  - contrib/hbqt/hbqt_destruct.cpp
+  - contrib/hbqt/hbqt_hbevents.cpp
+  - contrib/hbqt/hbqt_hbevents.h
+  - contrib/hbqt/hbqt_hbslots.cpp
+  - contrib/hbqt/hbqt_hbslots.h
+  - contrib/hbqt/hbqt_misc.prg
+  - contrib/hbqt/hbqt_utils.cpp
+  + contrib/hbqt/qtcore/hbqt_base.cpp
+  + contrib/hbqt/qtcore/hbqt_destruct.cpp
+  + contrib/hbqt/qtcore/hbqt_hbevents.cpp
+  + contrib/hbqt/qtcore/hbqt_hbevents.h
+  + contrib/hbqt/qtcore/hbqt_hbslots.cpp
+  + contrib/hbqt/qtcore/hbqt_hbslots.h
+  + contrib/hbqt/qtcore/hbqt_misc.prg
+  + contrib/hbqt/qtcore/hbqt_utils.cpp
+  * contrib/hbqt/qtcore/hbqtcore.hbm
+    * Moved hbqtcore files to their own component subdir.
+
+  - contrib/hbqt/hbqt_errorsys.prg
+  - contrib/hbqt/hbqt_hbqabstractitemmodel.cpp
+  - contrib/hbqt/hbqt_hbqabstractitemmodel.h
+  - contrib/hbqt/hbqt_hbqmainwindow.cpp
+  - contrib/hbqt/hbqt_hbqmainwindow.h
+  - contrib/hbqt/hbqt_hbqplaintextedit.cpp
+  - contrib/hbqt/hbqt_hbqplaintextedit.h
+  - contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
+  - contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
+  - contrib/hbqt/hbqt_hbqtableview.cpp
+  - contrib/hbqt/hbqt_hbqtableview.h
+  - contrib/hbqt/THbQtUI.prg
+  + contrib/hbqt/qtgui/hbqt_errorsys.prg
+  + contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h
+  + contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqmainwindow.h
+  + contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
+  + contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h
+  + contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqtableview.h
+  + contrib/hbqt/qtgui/THbQtUI.prg
+  * contrib/hbqt/qtgui/hbqtgui.hbm
+    * Moved hbqtgui files to their own component subdir.
+
+  - contrib/hbqt/qtdesigner/hbqtdesigner.qtp
+  - contrib/hbqt/qtwebkit/hbqtwebkit.qtp
+  + contrib/hbqt/utils/qtdesigner.qtp
+  + contrib/hbqt/utils/qtwebkit.qtp
+    * Moved .qtp files into utils subdir.
+
 2010-08-01 23:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   - contrib/hbqt/generator
     - Deleted. [ Confused SVN ]
@@ -230,7 +348,7 @@
     still one issue.
 
   ; TODO: Further cleanup to file layout. Componentize docs,
-          qth files, move files in central dir to component dirs.
+          qth files, move files in central dir to component dirs. [DONE]
 
   ; TOFIX: hbqtcore references qtgui in QMESSAGEBOX() which is a
            hbqtgui function. This has to be fixed. hbqtcore.dll is

harbour/contrib/hbplist

@@ -30,9 +30,7 @@ hbnetio/utils/hbnetio.hbp
 hbnf/hbnf.hbp
 hbodbc/hbodbc.hbp
 hbpgsql/hbpgsql.hbp
-hbqt/qtcore/hbqtcore.hbp
-hbqt/qtgui/hbqtgui.hbp
-hbqt/qtnetwork/hbqtnetwork.hbp
+hbqt/hbqt.hbp
 hbsms/hbsms.hbp
 hbsqlit3/hbsqlit3.hbp            # uses: sqlite3 (external)
 hbssl/hbssl.hbp

harbour/contrib/hbqt/hbqt.hbp

@@ -7,6 +7,8 @@
 # See COPYING for licensing terms.
 # ---------------------------------------------------------------
 
-qtcore/hbqtcore.hbp
-qtgui/hbqtgui.hbp
-qtnetwork/hbqtnetwork.hbp
+-hbcontainer
+
+hbqtcore.hbc
+hbqtgui.hbc
+hbqtnetwork.hbc

harbour/contrib/hbqt/hbqt_common.hbc

@@ -11,7 +11,7 @@ stop={dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}'hbqt' doesn't support this pl
 
 incpaths=.
 
-plugins=hbmk2_plugin_qt.hbs
+plugins=hbqt_hbmk2_plugin.hbs
 
 {msvc}ldflags=-nodefaultlib:msvcrt.lib -defaultlib:libcmt.lib
 
@@ -20,6 +20,3 @@ plugins=hbmk2_plugin_qt.hbs
 {allgcc}libs=supc++
 
 {win|os2}hbcppmm=yes
-
-gui=yes
-gt=gtnul

harbour/contrib/hbqt/hbqt_common.hbm

@@ -17,11 +17,13 @@
 
 -w3 -es2
 
+-i.
 -iqtcore
+-iqtcore/g
 
 -stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}
 
--plugin=hbmk2_plugin_qt.hbs
+-plugin=hbqt_hbmk2_plugin.hbs
 
 -depkeyhead=qt:QtCore/qglobal.h
 -depcontrol=qt:${HB_WITH_QT}

harbour/contrib/hbqt/qtcore/g/HBEvents.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/HBSlots.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QBitArray.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QBuffer.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QByteArray.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QChar.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QDataStream.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QDate.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QDateTime.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QDir.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QEvent.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QFile.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QIODevice.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QLine.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QLineF.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QList.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QLocale.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QMimeData.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QObject.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QPoint.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QPointF.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QProcess.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QRect.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QRectF.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QRegExp.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QResource.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QSettings.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QSize.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QSizeF.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QStringList.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QTextStream.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QThread.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QTime.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QTimer.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QTranslator.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QUrl.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/

harbour/contrib/hbqt/qtcore/g/QVariant.cpp

@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/