From f02efc4f691577d7b7cc5aa302fa4b8d796cd3f8 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 17 Nov 2011 18:50:37 +0000 Subject: [PATCH] 2011-11-17 10:47 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/qth/QLibraryInfo.qth ! Guarded: QLibraryInfo::buildDate() to be avialble only for Qt 4.6 and above. Function call stays as is, only return value will be nil. --- harbour/ChangeLog | 6 ++++++ harbour/contrib/hbqt/qtcore/qth/QLibraryInfo.qth | 2 ++ 2 files changed, 8 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5b19cb0fe5..2b366308ce 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2011-11-17 10:47 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtcore/qth/QLibraryInfo.qth + ! Guarded: QLibraryInfo::buildDate() to be avialble + only for Qt 4.6 and above. Function call stays as is, only + return value will be nil. + 2011-11-17 09:46 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbwin/hbwapi.h * harbour/contrib/hbwin/wapi_winbase.c diff --git a/harbour/contrib/hbqt/qtcore/qth/QLibraryInfo.qth b/harbour/contrib/hbqt/qtcore/qth/QLibraryInfo.qth index dfd194d12c..0fe71c430a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QLibraryInfo.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QLibraryInfo.qth @@ -46,7 +46,9 @@ enum LibraryLocation { PrefixPath, DocumentationPath, HeadersPath, LibrariesPath QDate buildDate (){ +#if QT_VERSION >= 0x040600 hbqt_create_objectGC( hbqt_gcAllocate_QDate( new QDate( QLibraryInfo::buildDate() ), true ) , "HB_QDATE" ); +#endif } QString buildKey (){ hb_retstr_utf8( QLibraryInfo::buildKey().toUtf8().data() );