diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2d8c0735e5..c2c6a619f9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,23 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-07 09:29 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + - contrib/hbqt/tests/Vou.ICO + + contrib/hbqt/tests/test.ico + ! Renamed to have all lower case. Please stick to this rule. + Couldn't find any reference to this file, please fix it + where needed. + + ; TOFIX: hbqt.h has hb_ToOutDebug() declared as external. So, + hbqt will also depend on xhb lib? If this function is + so important I'd suggest to create a fully portable + version of it locally in hbqt. + + - contrib/hbqt/gensource/Makefile + - Removed duplicate copy of Makefile. I'm not sure what was + the purpose but it wouldn't work here, and it wouldn't be + good to update this file in two copies. + 2009-04-06 23:52 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/hbqt/tests/vou.ico + Added icon to be displayed in titlebar. diff --git a/harbour/contrib/hbqt/gensource/Makefile b/harbour/contrib/hbqt/gensource/Makefile deleted file mode 100644 index b668e2f47b..0000000000 --- a/harbour/contrib/hbqt/gensource/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# -# $Id$ -# - -ROOT = ../../ - -LIBNAME=hbqt - -ifeq ($(HB_WITH_QT),) -HB_WITH_QT=yes -ifeq ($(HB_ARCHITECTURE),dos) -HB_WITH_QT=no -endif -ifeq ($(HB_ARCHITECTURE),os2) -HB_WITH_QT=no -endif -ifeq ($(HB_COMPILER),mingw64) -HB_WITH_QT=no -endif -ifeq ($(HB_COMPILER),owatcom) -HB_WITH_QT=no -endif -ifeq ($(HB_COMPILER),bcc) -HB_WITH_QT=no -endif -ifeq ($(HB_COMPILER),pocc) -HB_WITH_QT=no -endif -ifeq ($(HB_COMPILER),pocc64) -HB_WITH_QT=no -endif -ifeq ($(HB_COMPILER),poccce) -HB_WITH_QT=no -endif -ifeq ($(HB_COMPILER),poccarm) -HB_WITH_QT=no -endif -endif - -ifeq ($(HB_WITH_QT),yes) - -ifeq ($(HB_INC_QT),) -ifeq ($(HB_XBUILD),) -HB_INC_QT = /usr/include/qt4 /Developer/qt/include -endif -endif - -HB_INC_QT_OK += $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),)) - -ifneq ($(strip $(HB_INC_QT_OK)),) - -HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d)) - -include Makefile_gen - -include $(TOP)$(ROOT)config/header.cf -INSTALL_RULE_HEADERS := $(INSTALL_RULE) -include $(TOP)$(ROOT)config/lib.cf - -install:: - $(INSTALL_RULE_HEADERS) - -else -include $(TOP)$(ROOT)config/none.cf -endif -else -include $(TOP)$(ROOT)config/none.cf -endif diff --git a/harbour/contrib/hbqt/tests/Vou.ICO b/harbour/contrib/hbqt/tests/test.ico similarity index 100% rename from harbour/contrib/hbqt/tests/Vou.ICO rename to harbour/contrib/hbqt/tests/test.ico