2009-10-23 09:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

+ hbqt/qtgui/qtguis + hbqt/qtgui/qtguis/Makefile + hbqt/qtwebkit/qtwebkits + hbqt/qtwebkit/qtwebkits/Makefile + hbqt/qtcore/qtcores + hbqt/qtcore/qtcores/Makefile + hbqt/qtnetwork/qtnetworks + hbqt/qtnetwork/qtnetworks/Makefile + Added static files (not tested). * hbqt/Makefile ! Minor fix to build sub-libs.
2009-10-23 07:11:06 +00:00
parent d4433fa2b2
commit 5149d8f400
7 changed files with 255 additions and 1 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-10-23 09:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + hbqt/qtgui/qtguis
+  + hbqt/qtgui/qtguis/Makefile
+  + hbqt/qtwebkit/qtwebkits
+  + hbqt/qtwebkit/qtwebkits/Makefile
+  + hbqt/qtcore/qtcores
+  + hbqt/qtcore/qtcores/Makefile
+  + hbqt/qtnetwork/qtnetworks
+  + hbqt/qtnetwork/qtnetworks/Makefile
+    + Added static files (not tested).
+
+  * hbqt/Makefile
+    ! Minor fix to build sub-libs.
+
 2009-10-22 13:05 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
  * contrib/hbqt/generator/hbqtgen.prg
    ! Fixed : "warning C4100: 'Cargo' : unreferenced formal parameter"
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -61,9 +61,10 @@ ifneq ($(HB_HAS_QT),)
   ifneq ($(filter $(HB_PLATFORM),win wce),)
      ifneq ($(HB_QT_STATIC),)
         DIRS += hbqts
-         include $(TOP)$(ROOT)config/dir.mk
      endif
   endif
+
+   include $(TOP)$(ROOT)config/dir.mk
 else
   HB_SKIP_REASON := $(_DET_RES_TEXT)
   include $(TOP)$(ROOT)config/none.mk
--- a/harbour/contrib/hbqt/qtcore/qtcores/Makefile
+++ b/harbour/contrib/hbqt/qtcore/qtcores/Makefile
@@ -0,0 +1,59 @@
+#
+# $Id$
+#
+
+ROOT := ../../../../
+
+include $(TOP)$(ROOT)config/global.mk
+
+vpath %.cpp ../
+vpath %.prg ../
+
+LIBNAME := hbqtcores
+
+# force redetect. needed for _QT_DARWIN trick
+HB_HAS_QT :=
+
+_DET_DSP_NAME := qt
+_DET_VAR_INC_ := HB_INC_QT
+_DET_VAR_HAS_ := HB_HAS_QT
+_DET_FLT_PLAT := !dos !os2
+_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
+_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
+_DET_INC_HEAD := /Qt/qglobal.h
+include $(TOP)$(ROOT)config/detfun.mk
+
+_QT_DARWIN :=
+ifeq ($(HB_PLATFORM),darwin)
+   ifeq ($(HB_HAS_QT),)
+      _DET_DSP_NAME := qt
+      _DET_VAR_INC_ := HB_INC_QT
+      _DET_VAR_HAS_ := HB_HAS_QT
+      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Versions/4/Headers
+      _DET_INC_HEAD := /QtCore
+      include $(TOP)$(ROOT)config/detfun.mk
+      _QT_DARWIN := yes
+   endif
+endif
+
+ifneq ($(HB_HAS_QT),)
+
+   ifeq ($(_QT_DARWIN),yes)
+      HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+   else
+      HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+   endif
+
+   HB_CFLAGS += -DQT_NODLL
+
+   include $(TOP)$(ROOT)contrib/hbqt/qtcore/filelist.mk
+
+   include $(TOP)$(ROOT)config/header.mk
+   include $(TOP)$(ROOT)config/lib.mk
+else
+   HB_SKIP_REASON := $(_DET_RES_TEXT)
+   include $(TOP)$(ROOT)config/none.mk
+endif
--- a/harbour/contrib/hbqt/qtgui/qtguis/Makefile
+++ b/harbour/contrib/hbqt/qtgui/qtguis/Makefile
@@ -0,0 +1,59 @@
+#
+# $Id$
+#
+
+ROOT := ../../../../
+
+include $(TOP)$(ROOT)config/global.mk
+
+vpath %.cpp ../
+vpath %.prg ../
+
+LIBNAME := hbqtguis
+
+# force redetect. needed for _QT_DARWIN trick
+HB_HAS_QT :=
+
+_DET_DSP_NAME := qt
+_DET_VAR_INC_ := HB_INC_QT
+_DET_VAR_HAS_ := HB_HAS_QT
+_DET_FLT_PLAT := !dos !os2
+_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
+_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
+_DET_INC_HEAD := /Qt/qglobal.h
+include $(TOP)$(ROOT)config/detfun.mk
+
+_QT_DARWIN :=
+ifeq ($(HB_PLATFORM),darwin)
+   ifeq ($(HB_HAS_QT),)
+      _DET_DSP_NAME := qt
+      _DET_VAR_INC_ := HB_INC_QT
+      _DET_VAR_HAS_ := HB_HAS_QT
+      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Versions/4/Headers
+      _DET_INC_HEAD := /QtCore
+      include $(TOP)$(ROOT)config/detfun.mk
+      _QT_DARWIN := yes
+   endif
+endif
+
+ifneq ($(HB_HAS_QT),)
+
+   ifeq ($(_QT_DARWIN),yes)
+      HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+   else
+      HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+   endif
+
+   HB_CFLAGS += -DQT_NODLL
+
+   include $(TOP)$(ROOT)contrib/hbqt/qtgui/filelist.mk
+
+   include $(TOP)$(ROOT)config/header.mk
+   include $(TOP)$(ROOT)config/lib.mk
+else
+   HB_SKIP_REASON := $(_DET_RES_TEXT)
+   include $(TOP)$(ROOT)config/none.mk
+endif
--- a/harbour/contrib/hbqt/qtnetwork/qtnetworks/Makefile
+++ b/harbour/contrib/hbqt/qtnetwork/qtnetworks/Makefile
@@ -0,0 +1,59 @@
+#
+# $Id$
+#
+
+ROOT := ../../../../
+
+include $(TOP)$(ROOT)config/global.mk
+
+vpath %.cpp ../
+vpath %.prg ../
+
+LIBNAME := hbqtnetworks
+
+# force redetect. needed for _QT_DARWIN trick
+HB_HAS_QT :=
+
+_DET_DSP_NAME := qt
+_DET_VAR_INC_ := HB_INC_QT
+_DET_VAR_HAS_ := HB_HAS_QT
+_DET_FLT_PLAT := !dos !os2
+_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
+_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
+_DET_INC_HEAD := /Qt/qglobal.h
+include $(TOP)$(ROOT)config/detfun.mk
+
+_QT_DARWIN :=
+ifeq ($(HB_PLATFORM),darwin)
+   ifeq ($(HB_HAS_QT),)
+      _DET_DSP_NAME := qt
+      _DET_VAR_INC_ := HB_INC_QT
+      _DET_VAR_HAS_ := HB_HAS_QT
+      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Versions/4/Headers
+      _DET_INC_HEAD := /QtCore
+      include $(TOP)$(ROOT)config/detfun.mk
+      _QT_DARWIN := yes
+   endif
+endif
+
+ifneq ($(HB_HAS_QT),)
+
+   ifeq ($(_QT_DARWIN),yes)
+      HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+   else
+      HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+   endif
+
+   HB_CFLAGS += -DQT_NODLL
+
+   include $(TOP)$(ROOT)contrib/hbqt/qtnetwork/filelist.mk
+
+   include $(TOP)$(ROOT)config/header.mk
+   include $(TOP)$(ROOT)config/lib.mk
+else
+   HB_SKIP_REASON := $(_DET_RES_TEXT)
+   include $(TOP)$(ROOT)config/none.mk
+endif
--- a/harbour/contrib/hbqt/qtwebkit/qtwebkits/Makefile
+++ b/harbour/contrib/hbqt/qtwebkit/qtwebkits/Makefile
@@ -0,0 +1,59 @@
+#
+# $Id$
+#
+
+ROOT := ../../../../
+
+include $(TOP)$(ROOT)config/global.mk
+
+vpath %.cpp ../
+vpath %.prg ../
+
+LIBNAME := hbqtwebkits
+
+# force redetect. needed for _QT_DARWIN trick
+HB_HAS_QT :=
+
+_DET_DSP_NAME := qt
+_DET_VAR_INC_ := HB_INC_QT
+_DET_VAR_HAS_ := HB_HAS_QT
+_DET_FLT_PLAT := !dos !os2
+_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
+_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
+_DET_INC_HEAD := /Qt/qglobal.h
+include $(TOP)$(ROOT)config/detfun.mk
+
+_QT_DARWIN :=
+ifeq ($(HB_PLATFORM),darwin)
+   ifeq ($(HB_HAS_QT),)
+      _DET_DSP_NAME := qt
+      _DET_VAR_INC_ := HB_INC_QT
+      _DET_VAR_HAS_ := HB_HAS_QT
+      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Versions/4/Headers
+      _DET_INC_HEAD := /QtCore
+      include $(TOP)$(ROOT)config/detfun.mk
+      _QT_DARWIN := yes
+   endif
+endif
+
+ifneq ($(HB_HAS_QT),)
+
+   ifeq ($(_QT_DARWIN),yes)
+      HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+   else
+      HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+   endif
+
+   HB_CFLAGS += -DQT_NODLL
+
+   include $(TOP)$(ROOT)contrib/hbqt/qtwebkit/filelist.mk
+
+   include $(TOP)$(ROOT)config/header.mk
+   include $(TOP)$(ROOT)config/lib.mk
+else
+   HB_SKIP_REASON := $(_DET_RES_TEXT)
+   include $(TOP)$(ROOT)config/none.mk
+endif
--- a/harbour/contrib/xhb/hbcompat.ch
+++ b/harbour/contrib/xhb/hbcompat.ch
@@ -505,6 +505,9 @@
   #command @ <row>, <col> PROMPT <prompt> [ MESSAGE <msg> ] [ COLOR <color> ] => ;
      __AtPrompt( <row>, <col>, <prompt>, <msg>, <color> )

+   #command SET TRIMFILENAME <x:ON,OFF,&> => Set( _SET_TRIMFILENAME, <(x)> )
+   #command SET TIME FORMAT [TO] <f>      => Set( _SET_TIMEFORMAT, <f> )
+
 #endif

 #endif /* __HARBOUR__ */