2009-10-22 20:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbqt/Makefile * contrib/hbqt/qtgui/Makefile * contrib/hbqt/qtwebkit/Makefile * contrib/hbqt/qtcore/Makefile * contrib/hbqt/qtnetwork/Makefile * contrib/hbqt/hbqts.hbc ! Minor cleanups and fixes after recent restructuring. Nice job Pritpal. ; TODO: Since now QT detection .mk code will be replicated in 10 places, this will have to be optimized. ; TOFIX: static mode. ; TOFIX: I'm getting a compile error, so could check the whole build run yet: --- hbqt_slots.cpp ../../../hbqt_slots.cpp(1787) : error C2065: 'str' : undeclared identifier ../../../hbqt_slots.cpp(1787) : error C2065: 'str' : undeclared identifier ../../../hbqt_slots.cpp(1787) : error C2070: ''unknown-type'': illegal sizeof operand ../../../hbqt_slots.cpp(1787) : error C2065: 'str' : undeclared identifier --- ; TOFIX: I saw these warnings in almost all tested .cpp files: --- ../../../QWebSettings.cpp(86) : warning C4100: 'Cargo' : unreferenced formal parameter --- * contrib/hbqt/generator/hbqtgen.prg * contrib/hbqt/generator/qt45.qtp ! Added missing SVN headers. * contrib/hbqt/hbqt.hbc + Minor formatting.
2009-10-22 18:35:47 +00:00
parent 3c39677606
commit 38e6687675
10 changed files with 58 additions and 17 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,40 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-10-22 20:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/Makefile
+  * contrib/hbqt/qtgui/Makefile
+  * contrib/hbqt/qtwebkit/Makefile
+  * contrib/hbqt/qtcore/Makefile
+  * contrib/hbqt/qtnetwork/Makefile
+  * contrib/hbqt/hbqts.hbc
+    ! Minor cleanups and fixes after recent restructuring.
+        Nice job Pritpal.
+
+    ; TODO: Since now QT detection .mk code will be replicated 
+            in 10 places, this will have to be optimized.
+    ; TOFIX: static mode.
+
+    ; TOFIX: I'm getting a compile error, so could check the whole build run yet:
+      ---
+      hbqt_slots.cpp
+      ../../../hbqt_slots.cpp(1787) : error C2065: 'str' : undeclared identifier
+      ../../../hbqt_slots.cpp(1787) : error C2065: 'str' : undeclared identifier
+      ../../../hbqt_slots.cpp(1787) : error C2070: ''unknown-type'': illegal sizeof operand
+      ../../../hbqt_slots.cpp(1787) : error C2065: 'str' : undeclared identifier
+      ---
+    ; TOFIX: I saw these warnings in almost all tested .cpp files:
+      ---
+      ../../../QWebSettings.cpp(86) : warning C4100: 'Cargo' : unreferenced formal parameter
+      ---
+
+  * contrib/hbqt/generator/hbqtgen.prg
+  * contrib/hbqt/generator/qt45.qtp
+    ! Added missing SVN headers.
+
+  * contrib/hbqt/hbqt.hbc
+    + Minor formatting.
+
 2009-10-22 18:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
  * contrib/hbqt/qth/QAbstractItemModel.qth
  * contrib/hbqt/qth/QAbstractScrollArea.qth
@@ -1139,7 +1173,7 @@
  * contrib/rddads/adsfunc.c
  * contrib/rddads/rddads.h
  * contrib/rddads/ads1.c
-    ! Fixed fatal errors for 64-bit builds. I don't if there exist 
+    ! Fixed fatal errors for 64-bit builds. I don't know if there exist 
      a 64-bit version of ACE, but anyway.

 2009-10-20 13:48 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -52,6 +52,12 @@ ifneq ($(HB_HAS_QT),)
   include $(TOP)$(ROOT)config/header.mk
   include $(TOP)$(ROOT)config/lib.mk

+   DIRS += \
+      qtcore \
+      qtgui \
+      qtnetwork \
+      qtwebkit    
+
   ifneq ($(filter $(HB_PLATFORM),win wce),)
      ifneq ($(HB_QT_STATIC),)
         DIRS += hbqts
--- a/harbour/contrib/hbqt/generator/hbqtgen.prg
+++ b/harbour/contrib/hbqt/generator/hbqtgen.prg
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 #include "common.ch"
 #include "fileio.ch"

--- a/harbour/contrib/hbqt/generator/qt45.qtp
+++ b/harbour/contrib/hbqt/generator/qt45.qtp
@@ -1,3 +1,7 @@
+;
+; $Id$
+;
+
 ;
 ; Harbour Source Wrapper Generator's Project File for QT v4.5
 ;
--- a/harbour/contrib/hbqt/hbqt.hbc
+++ b/harbour/contrib/hbqt/hbqt.hbc
@@ -8,6 +8,7 @@ incpaths=.

 libs=hbqt
 libs=hbqtcore hbqtgui hbqtnetwork hbqtwebkit
+
 {win}libs=version shlwapi
 {allwin}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
 {linux}libs=QtCore QtGui QtNetwork QtWebKit
@@ -16,5 +17,6 @@ libs=hbqtcore hbqtgui hbqtnetwork hbqtwebkit
 {darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
 {darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
 {allgcc}libs=supc++
+
 gui=yes
 gt=gtnul
--- a/harbour/contrib/hbqt/hbqts.hbc
+++ b/harbour/contrib/hbqt/hbqts.hbc
@@ -7,8 +7,11 @@ incpaths=.
 {allwin}libpaths=${HB_DIR_QT}\lib

 libs=hbqts
+libs=hbqtcores hbqtguis hbqtnetworks hbqtwebkits
+
 {win}libs=version shlwapi
 {allwin}libs=QtCore QtGui QtNetwork QtWebKit
 {allgcc}libs=supc++
+
 gui=yes
 gt=gtnul
--- a/harbour/contrib/hbqt/qtcore/Makefile
+++ b/harbour/contrib/hbqt/qtcore/Makefile
@@ -8,9 +8,6 @@ include $(TOP)$(ROOT)config/global.mk

 LIBNAME := hbqtcore

-PRG_HEADERS := \
-   ../hbqt.ch \
-
 # force redetect. needed for _QT_DARWIN trick
 HB_HAS_QT :=

@@ -54,7 +51,7 @@ ifneq ($(HB_HAS_QT),)

   ifneq ($(filter $(HB_PLATFORM),win wce),)
      ifneq ($(HB_QT_STATIC),)
-         DIRS += hbqts
+         DIRS += qtcores
         include $(TOP)$(ROOT)config/dir.mk
      endif
   endif
--- a/harbour/contrib/hbqt/qtgui/Makefile
+++ b/harbour/contrib/hbqt/qtgui/Makefile
@@ -8,9 +8,6 @@ include $(TOP)$(ROOT)config/global.mk

 LIBNAME := hbqtgui

-PRG_HEADERS := \
-   ../hbqt.ch \
-
 # force redetect. needed for _QT_DARWIN trick
 HB_HAS_QT :=

@@ -54,7 +51,7 @@ ifneq ($(HB_HAS_QT),)

   ifneq ($(filter $(HB_PLATFORM),win wce),)
      ifneq ($(HB_QT_STATIC),)
-         DIRS += hbqts
+         DIRS += qtguis
         include $(TOP)$(ROOT)config/dir.mk
      endif
   endif
--- a/harbour/contrib/hbqt/qtnetwork/Makefile
+++ b/harbour/contrib/hbqt/qtnetwork/Makefile
@@ -8,9 +8,6 @@ include $(TOP)$(ROOT)config/global.mk

 LIBNAME := hbqtnetwork

-PRG_HEADERS := \
-   ../hbqt.ch \
-
 # force redetect. needed for _QT_DARWIN trick
 HB_HAS_QT :=

@@ -54,7 +51,7 @@ ifneq ($(HB_HAS_QT),)

   ifneq ($(filter $(HB_PLATFORM),win wce),)
      ifneq ($(HB_QT_STATIC),)
-         DIRS += hbqts
+         DIRS += qtnetworks
         include $(TOP)$(ROOT)config/dir.mk
      endif
   endif
--- a/harbour/contrib/hbqt/qtwebkit/Makefile
+++ b/harbour/contrib/hbqt/qtwebkit/Makefile
@@ -8,9 +8,6 @@ include $(TOP)$(ROOT)config/global.mk

 LIBNAME := hbqtwebkit

-PRG_HEADERS := \
-   ../hbqt.ch \
-
 # force redetect. needed for _QT_DARWIN trick
 HB_HAS_QT :=

@@ -54,7 +51,7 @@ ifneq ($(HB_HAS_QT),)

   ifneq ($(filter $(HB_PLATFORM),win wce),)
      ifneq ($(HB_QT_STATIC),)
-         DIRS += hbqts
+         DIRS += qtwebkits
         include $(TOP)$(ROOT)config/dir.mk
      endif
   endif