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

+ contrib/hbqt/hbqt_common.hbc * contrib/hbqt/hbqt_common.hbm * contrib/hbqt/hbqtcore.hbc - contrib/hbqt/hbqtcore.hbp - contrib/hbqt/hbqtcores.hbp - contrib/hbqt/hbqtcore_filelist.hbm + contrib/hbqt/qtgui/hbqtgui.hbc + contrib/hbqt/qtgui/hbqtgui.hbm + contrib/hbqt/qtgui/hbqtgui.hbp + contrib/hbqt/qtgui/hbqtguis.hbp - contrib/hbqt/hbqtgui_filelist.hbm + contrib/hbqt/qtcore/hbqtcore.hbc + contrib/hbqt/qtcore/hbqtcore.hbm + contrib/hbqt/qtcore/hbqtcore.hbp + contrib/hbqt/qtcore/hbqtcores.hbp - contrib/hbqt/hbqtgui.hbp - contrib/hbqt/hbqtguis.hbp - contrib/hbqt/hbqtnetwork.hbp - contrib/hbqt/hbqtnetworks.hbp + contrib/hbqt/qtnetwork/hbqtnetwork.hbc + contrib/hbqt/qtnetwork/hbqtnetwork.hbp + contrib/hbqt/qtnetwork/hbqtnetworks.hbp * contrib/hbplist * Moved as much as possible make logic to components. (left central .hbc file to make autofind happy and hide internal layout details from users) ! Missed some files form prev commits. + contrib/hbqt/hbqt.hbp + Readded central make file to make it easy to build all sub-components at once. - contrib/hbqt/generator2 + contrib/hbqt/generator/hbqtgen2.prg + contrib/hbqt/generator/QtGui.txt + contrib/hbqt/generator/QtCore.txt + contrib/hbqt/generator/QtNetwork.txt * Moved generator2 code to generator dir.
2010-08-01 17:42:29 +00:00
parent a033ea56f9
commit b5dd867e9a
26 changed files with 215 additions and 105 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,46 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2010-08-01 19:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + contrib/hbqt/hbqt_common.hbc
+  * contrib/hbqt/hbqt_common.hbm
+  * contrib/hbqt/hbqtcore.hbc
+  - contrib/hbqt/hbqtcore.hbp
+  - contrib/hbqt/hbqtcores.hbp
+  - contrib/hbqt/hbqtcore_filelist.hbm
+  + contrib/hbqt/qtgui/hbqtgui.hbc
+  + contrib/hbqt/qtgui/hbqtgui.hbm
+  + contrib/hbqt/qtgui/hbqtgui.hbp
+  + contrib/hbqt/qtgui/hbqtguis.hbp
+  - contrib/hbqt/hbqtgui_filelist.hbm
+  + contrib/hbqt/qtcore/hbqtcore.hbc
+  + contrib/hbqt/qtcore/hbqtcore.hbm
+  + contrib/hbqt/qtcore/hbqtcore.hbp
+  + contrib/hbqt/qtcore/hbqtcores.hbp
+  - contrib/hbqt/hbqtgui.hbp
+  - contrib/hbqt/hbqtguis.hbp
+  - contrib/hbqt/hbqtnetwork.hbp
+  - contrib/hbqt/hbqtnetworks.hbp
+  + contrib/hbqt/qtnetwork/hbqtnetwork.hbc
+  + contrib/hbqt/qtnetwork/hbqtnetwork.hbp
+  + contrib/hbqt/qtnetwork/hbqtnetworks.hbp
+  * contrib/hbplist
+    * Moved as much as possible make logic to components.
+      (left central .hbc file to make autofind happy
+      and hide internal layout details from users)
+    ! Missed some files form prev commits.
+
+  + contrib/hbqt/hbqt.hbp
+    + Readded central make file to make it easy to build all
+      sub-components at once.
+
+  - contrib/hbqt/generator2
+  + contrib/hbqt/generator/hbqtgen2.prg
+  + contrib/hbqt/generator/QtGui.txt
+  + contrib/hbqt/generator/QtCore.txt
+  + contrib/hbqt/generator/QtNetwork.txt
+    * Moved generator2 code to generator dir.
+
 2010-08-01 18:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  - contrib/hbqt/qth
  - contrib/hbqt/doc
--- a/harbour/contrib/hbplist
+++ b/harbour/contrib/hbplist
@@ -30,9 +30,9 @@ hbnetio/utils/hbnetio.hbp
 hbnf/hbnf.hbp
 hbodbc/hbodbc.hbp
 hbpgsql/hbpgsql.hbp
-hbqt/hbqtcore.hbp
-hbqt/hbqtgui.hbp
-hbqt/hbqtnetwork.hbp
+hbqt/qtcore/hbqtcore.hbp
+hbqt/qtgui/hbqtgui.hbp
+hbqt/qtnetwork/hbqtnetwork.hbp
 hbsms/hbsms.hbp
 hbsqlit3/hbsqlit3.hbp            # uses: sqlite3 (external)
 hbssl/hbssl.hbp
--- a/harbour/contrib/hbqt/generator2/QtCore.txt
+++ b/harbour/contrib/hbqt/generator2/QtCore.txt
--- a/harbour/contrib/hbqt/generator2/QtGui.txt
+++ b/harbour/contrib/hbqt/generator2/QtGui.txt
--- a/harbour/contrib/hbqt/generator2/QtNetwork.txt
+++ b/harbour/contrib/hbqt/generator2/QtNetwork.txt
--- a/harbour/contrib/hbqt/generator2/hbqtgen2.prg
+++ b/harbour/contrib/hbqt/generator2/hbqtgen2.prg
--- a/harbour/contrib/hbqt/hbqt.hbp
+++ b/harbour/contrib/hbqt/hbqt.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+qtcore/hbqtcore.hbp
+qtgui/hbqtgui.hbp
+qtnetwork/hbqtnetwork.hbp
--- a/harbour/contrib/hbqt/hbqt_common.hbc
+++ b/harbour/contrib/hbqt/hbqt_common.hbc
@@ -0,0 +1,25 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+stop={dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}'hbqt' doesn't support this platform/compiler (${hb_plat}/${hb_comp}).
+
+incpaths=.
+
+plugins=hbmk2_plugin_qt.hbs
+
+{msvc}ldflags=-nodefaultlib:msvcrt.lib -defaultlib:libcmt.lib
+
+{allwin|os2}libpaths=${HB_WITH_QT}\..\lib
+
+{allgcc}libs=supc++
+
+{win|os2}hbcppmm=yes
+
+gui=yes
+gt=gtnul
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -3,7 +3,7 @@
 #

 # ---------------------------------------------------------------
-# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
 # See COPYING for licensing terms.
 # ---------------------------------------------------------------

--- a/harbour/contrib/hbqt/hbqtcore.hbc
+++ b/harbour/contrib/hbqt/hbqtcore.hbc
@@ -3,32 +3,8 @@
 #

 # ---------------------------------------------------------------
-# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
 # See COPYING for licensing terms.
 # ---------------------------------------------------------------

-stop={dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}'hbqt' doesn't support this platform/compiler (${hb_plat}/${hb_comp}).
-
-incpaths=.
-
-plugins=hbmk2_plugin_qt.hbs
-
-{msvc}ldflags=-nodefaultlib:msvcrt.lib -defaultlib:libcmt.lib
-
-{allwin|os2}libpaths=${HB_WITH_QT}\..\lib
-
-# TOFIX: QtGui is needed by hbqt_hbslots.cpp. This dependency should be removed.
-{!HB_STATIC_QT}libs=hbqtcore${__HB_DYN__}
-{!HB_STATIC_QT&(allwin|os2)}libs=QtCore4 QtGui4
-{!HB_STATIC_QT&linux}libs=QtCore QtGui
-{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore /Library/Frameworks/QtGui.framework/QtGui
-{HB_STATIC_QT&allwin}libs=hbqtcores${__HB_DYN__}
-{HB_STATIC_QT&linux}libs=hbqtcore
-{HB_STATIC_QT&(allwin|linux)}libs=QtCore QtGui
-
-{allgcc}libs=supc++
-
-{win|os2}hbcppmm=yes
-
-gui=yes
-gt=gtnul
+libs=qtcore/hbqtcore.hbc
--- a/harbour/contrib/hbqt/hbqtcore.hbp
+++ b/harbour/contrib/hbqt/hbqtcore.hbp
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_common.hbm
-
-qtcore/filelist.hbm
-hbqtcore_filelist.hbm
-
-hbqtcores.hbp
--- a/harbour/contrib/hbqt/hbqtcore_filelist.hbm
+++ b/harbour/contrib/hbqt/hbqtcore_filelist.hbm
@@ -1,13 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_base.cpp
-hbqt_destruct.cpp
-hbqt_hbevents.cpp
-hbqt_hbslots.cpp
-hbqt_utils.cpp
-hbqt_misc.prg
-
-hbqt_hbevents.h
-hbqt_hbslots.h
--- a/harbour/contrib/hbqt/hbqtgui.hbp
+++ b/harbour/contrib/hbqt/hbqtgui.hbp
@@ -1,12 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_common.hbm
-
-qtgui/filelist.hbm
-hbqtgui_filelist.hbm
-
-hbqtcore.hbc
-
-hbqtguis.hbp
--- a/harbour/contrib/hbqt/hbqtgui_filelist.hbm
+++ b/harbour/contrib/hbqt/hbqtgui_filelist.hbm
@@ -1,18 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_hbqabstractitemmodel.cpp
-hbqt_hbqmainwindow.cpp
-hbqt_hbqplaintextedit.cpp
-hbqt_hbqsyntaxhighlighter.cpp
-hbqt_hbqtableview.cpp
-
-hbqt_hbqabstractitemmodel.h
-hbqt_hbqmainwindow.h
-hbqt_hbqplaintextedit.h
-hbqt_hbqsyntaxhighlighter.h
-hbqt_hbqtableview.h
-
-hbqt_errorsys.prg
-THbQtUI.prg
--- a/harbour/contrib/hbqt/hbqtnetwork.hbp
+++ b/harbour/contrib/hbqt/hbqtnetwork.hbp
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_common.hbm
-
-qtnetwork/filelist.hbm
-
-hbqtcore.hbc
-
-hbqtnetworks.hbp
--- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
@@ -0,0 +1,19 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+libs=../hbqt_common.hbc
+
+# TOFIX: QtGui is needed by hbqt_hbslots.cpp. This dependency should be removed.
+{!HB_STATIC_QT}libs=hbqtcore${__HB_DYN__}
+{!HB_STATIC_QT&(allwin|os2)}libs=QtCore4 QtGui4
+{!HB_STATIC_QT&linux}libs=QtCore QtGui
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore /Library/Frameworks/QtGui.framework/QtGui
+{HB_STATIC_QT&allwin}libs=hbqtcores${__HB_DYN__}
+{HB_STATIC_QT&linux}libs=hbqtcore
+{HB_STATIC_QT&(allwin|linux)}libs=QtCore QtGui
--- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm
@@ -0,0 +1,13 @@
+#
+# $Id$
+#
+
+../hbqt_base.cpp
+../hbqt_destruct.cpp
+../hbqt_hbevents.cpp
+../hbqt_hbslots.cpp
+../hbqt_utils.cpp
+../hbqt_misc.prg
+
+../hbqt_hbevents.h
+../hbqt_hbslots.h
--- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbp
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbp
@@ -0,0 +1,10 @@
+#
+# $Id$
+#
+
+../hbqt_common.hbm
+
+filelist.hbm
+hbqtcore.hbm
+
+hbqtcores.hbp
--- a/harbour/contrib/hbqt/qtcore/hbqtcores.hbp
+++ b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp
@@ -2,11 +2,10 @@
 # $Id$
 #

-hbqt_common.hbm
+../hbqt_common.hbm

-qtnetwork/filelist.hbm
-
-hbqtcore.hbc
+filelist.hbm
+hbqtcore.hbm

 -stop{!HB_QT_BUILD_STATIC|!allwin}

--- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
@@ -0,0 +1,20 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+libs=../qtcore/hbqtcore.hbc
+
+{!HB_STATIC_QT}libs=hbqtgui${__HB_DYN__}
+{!HB_STATIC_QT&(allwin|os2)}libs=QtGui4
+{!HB_STATIC_QT&linux}libs=QtGui
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
+{!HB_STATIC_QT}libs=QtUiTools
+{HB_STATIC_QT&allwin}libs=hbqtguis${__HB_DYN__}
+{HB_STATIC_QT&linux}libs=hbqtgui
+{HB_STATIC_QT&(allwin|linux)}libs=QtGui
+{HB_STATIC_QT&(allwin|linux)}libs=QtUiTools
--- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm
@@ -0,0 +1,18 @@
+#
+# $Id$
+#
+
+../hbqt_hbqabstractitemmodel.cpp
+../hbqt_hbqmainwindow.cpp
+../hbqt_hbqplaintextedit.cpp
+../hbqt_hbqsyntaxhighlighter.cpp
+../hbqt_hbqtableview.cpp
+
+../hbqt_hbqabstractitemmodel.h
+../hbqt_hbqmainwindow.h
+../hbqt_hbqplaintextedit.h
+../hbqt_hbqsyntaxhighlighter.h
+../hbqt_hbqtableview.h
+
+../hbqt_errorsys.prg
+../THbQtUI.prg
--- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbp
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+../hbqt_common.hbm
+
+filelist.hbm
+hbqtgui.hbm
+
+../qtcore/hbqtcore.hbc
+
+hbqtguis.hbp
--- a/harbour/contrib/hbqt/qtgui/hbqtguis.hbp
+++ b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp
@@ -2,12 +2,12 @@
 # $Id$
 #

-hbqt_common.hbm
+../hbqt_common.hbm

-qtgui/filelist.hbm
-hbqtgui_filelist.hbm
+filelist.hbm
+hbqtgui.hbm

-hbqtcore.hbc
+../qtcore/hbqtcore.hbc

 -stop{!HB_QT_BUILD_STATIC|!allwin}

--- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
@@ -0,0 +1,18 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+libs=../qtcore/hbqtcore.hbc
+
+{!HB_STATIC_QT}libs=hbqtnetwork${__HB_DYN__}
+{!HB_STATIC_QT&(allwin|os2)}libs=QtNetwork4
+{!HB_STATIC_QT&linux}libs=QtNetwork
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
+{HB_STATIC_QT&allwin}libs=hbqtnetworks${__HB_DYN__}
+{HB_STATIC_QT&linux}libs=hbqtnetwork
+{HB_STATIC_QT&(allwin|linux)}libs=QtNetwork
--- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbp
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbp
@@ -0,0 +1,11 @@
+#
+# $Id$
+#
+
+../hbqt_common.hbm
+
+filelist.hbm
+
+../qtcore/hbqtcore.hbc
+
+hbqtnetworks.hbp
--- a/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp
@@ -2,10 +2,11 @@
 # $Id$
 #

-hbqt_common.hbm
+../hbqt_common.hbm

-qtcore/filelist.hbm
-hbqtcore_filelist.hbm
+filelist.hbm
+
+../qtcore/hbqtcore.hbc

 -stop{!HB_QT_BUILD_STATIC|!allwin}