From 91f79625c258a86c4b803f069eea80dd7fa9db48 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 28 Jun 2010 00:31:23 +0000
Subject: [PATCH] 2010-06-28 02:29 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbqt/qtwebkit/hbqtwebkit.hbp   +
 contrib/hbqt/qtwebkit/hbqtwebkits.hbp   *
 contrib/hbqt/qtdesigner/hbqtdesigner.hbp   +
 contrib/hbqt/qtdesigner/hbqtdesigners.hbp     + Added working hbmk2 make
 files, also for Windows static mode.       (BTW, basically a simple copy of
 existing qt ones)

---
 harbour/ChangeLog                             |  8 +++
 .../contrib/hbqt/qtdesigner/hbqtdesigner.hbp  | 50 ++++-------------
 .../contrib/hbqt/qtdesigner/hbqtdesigners.hbp | 12 +++++
 harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp  | 54 ++++---------------
 harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp | 12 +++++
 5 files changed, 50 insertions(+), 86 deletions(-)
 create mode 100644 harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp
 create mode 100644 harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 907dd35b80..b65d066a39 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-28 02:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/qtwebkit/hbqtwebkit.hbp
+  + contrib/hbqt/qtwebkit/hbqtwebkits.hbp
+  * contrib/hbqt/qtdesigner/hbqtdesigner.hbp
+  + contrib/hbqt/qtdesigner/hbqtdesigners.hbp
+    + Added working hbmk2 make files, also for Windows static mode.
+      (BTW, basically a simple copy of existing qt ones)
+
 2010-06-28 02:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/gtwvg/tests/demowvg.hbp
     ! One more "hbide_location" deleted.
diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
index 43a969f2ab..4fb866a748 100644
--- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
+++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
@@ -1,45 +1,13 @@
--3rd=hbide_version=1.0
--3rd=hbide_type=Lib
--3rd=hbide_title=qtdesigner
--3rd=hbide_workingfolder=
--3rd=hbide_destinationfolder=
--3rd=hbide_output=qscintilla
--3rd=hbide_launchparams=
--3rd=hbide_launchprogram=
--3rd=hbide_backupfolder=
--3rd=hbide_xhb=NO
--3rd=hbide_xpp=NO
--3rd=hbide_clp=NO
+#
+# $Id$
+#
 
--info
--trace
--inc
--w2
--es2
--hblib
--incpath=../
--incpath=${HB_WITH_QT}
--incpath=${HB_WITH_QT}/QtDesigner
+../hbqt_common.hbm
 
--ohbqtdesigner
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
--plugin=../../../utils/hbmk2/examples/plug_moc.prg
+*.cpp
+*.prg
 
-
-QDesignerActionEditorInterface.cpp
-QDesignerFormEditorInterface.cpp
-QDesignerFormWindowCursorInterface.cpp
-QDesignerFormWindowInterface.cpp
-QDesignerFormWindowManagerInterface.cpp
-QDesignerObjectInspectorInterface.cpp
-QDesignerPropertyEditorInterface.cpp
-QDesignerWidgetBoxInterface.cpp
-
-TQDesignerActionEditorInterface.prg
-TQDesignerFormEditorInterface.prg
-TQDesignerFormWindowCursorInterface.prg
-TQDesignerFormWindowInterface.prg
-TQDesignerFormWindowManagerInterface.prg
-TQDesignerObjectInspectorInterface.prg
-TQDesignerPropertyEditorInterface.prg
-TQDesignerWidgetBoxInterface.prg
+#-pi=*.h
diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp b/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp
new file mode 100644
index 0000000000..1f51e030e2
--- /dev/null
+++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+-stop{!HB_QT_STATIC|!allwin}
+
+hbqtdesigner.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
index 6ebcf60be6..4fb866a748 100644
--- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
+++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
@@ -1,49 +1,13 @@
--3rd=hbide_version=1.0
--3rd=hbide_type=Lib
--3rd=hbide_title=qtwebkit
--3rd=hbide_workingfolder=
--3rd=hbide_destinationfolder=
--3rd=hbide_output=qtwebkit
--3rd=hbide_launchparams=
--3rd=hbide_launchprogram=
--3rd=hbide_backupfolder=
--3rd=hbide_xhb=NO
--3rd=hbide_xpp=NO
--3rd=hbide_clp=NO
+#
+# $Id$
+#
 
--info
--trace
--inc
--w2
--es2
--hblib
--incpath=../
--incpath=${HB_WITH_QT}
--incpath=${HB_WITH_QT}/QtWebKit
+../hbqt_common.hbm
 
--ohbqtwebkit
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
--plugin=../../../utils/hbmk2/examples/plug_moc.prg
+*.cpp
+*.prg
 
-
-QWebFrame.cpp
-QWebHistory.cpp
-QWebHistoryInterface.cpp
-QWebHistoryItem.cpp
-QWebHitTestResult.cpp
-QWebPage.cpp
-QWebPluginFactory.cpp
-QWebSecurityOrigin.cpp
-QWebSettings.cpp
-QWebView.cpp
-
-TQWebFrame.prg
-TQWebHistory.prg
-TQWebHistoryInterface.prg
-TQWebHistoryItem.prg
-TQWebHitTestResult.prg
-TQWebPage.prg
-TQWebPluginFactory.prg
-TQWebSecurityOrigin.prg
-TQWebSettings.prg
-TQWebView.prg
+#-pi=*.h
diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp b/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp
new file mode 100644
index 0000000000..7d048abb22
--- /dev/null
+++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+-stop{!HB_QT_STATIC|!allwin}
+
+hbqtwebkit.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-cflag=-DQT_NODLL