diff --git a/harbour/ChangeLog b/harbour/ChangeLog index aed7aeac2b..7d535d053b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,4 +1,4 @@ -/* +/* * $Id$ */ @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-10-13 15:31 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtcore/hbqtcore.ch + + Added: QLibraryInfo_* constants. + + * contrib/hbqt/qtcore/hbqtcore.hbx + * contrib/hbqt/qtcore/qth/filelist.hbm + + contrib/hbqt/qtcore/qth/QLibraryInfo.qth + + Added: Class QLibraryInfo() + Not tested. + 2011-10-13 23:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/ChangeLog * marked patches merged with 3.0 branch diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.ch b/harbour/contrib/hbqt/qtcore/hbqtcore.ch index a5be36bd6f..692cca3279 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.ch +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.ch @@ -85,4 +85,17 @@ #define QFile_WriteOther 0x0002 // The file is writable by anyone. #define QFile_ExeOther 0x0001 // The file is executable by anyone. + +#define QLibraryInfo_PrefixPath 0 // The default prefix for all paths. +#define QLibraryInfo_DocumentationPath 1 // The location for documentation upon install. +#define QLibraryInfo_HeadersPath 2 // The location for all headers. +#define QLibraryInfo_LibrariesPath 3 // The location of installed librarires. +#define QLibraryInfo_BinariesPath 4 // The location of installed Qt binaries (tools and applications). +#define QLibraryInfo_PluginsPath 5 // The location of installed Qt plugins. +#define QLibraryInfo_DataPath 6 // The location of general Qt data. +#define QLibraryInfo_TranslationsPath 7 // The location of translation information for Qt strings. +#define QLibraryInfo_SettingsPath 8 // The location for Qt settings. +#define QLibraryInfo_ExamplesPath 10 // The location for examples upon install. +#define QLibraryInfo_DemosPath 9 // The location for demos upon install. + #endif diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbx b/harbour/contrib/hbqt/qtcore/hbqtcore.hbx index 7858105d25..113ee99944 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbx +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbx @@ -57,6 +57,7 @@ DYNAMIC HB_QGENERICRETURNARGUMENT DYNAMIC HB_QIODEVICE DYNAMIC HB_QLATIN1CHAR DYNAMIC HB_QLATIN1STRING +DYNAMIC HB_QLIBRARYINFO DYNAMIC HB_QLINE DYNAMIC HB_QLINEF DYNAMIC HB_QLIST @@ -117,6 +118,7 @@ DYNAMIC QGENERICRETURNARGUMENT DYNAMIC QIODEVICE DYNAMIC QLATIN1CHAR DYNAMIC QLATIN1STRING +DYNAMIC QLIBRARYINFO DYNAMIC QLINE DYNAMIC QLINEF DYNAMIC QLIST diff --git a/harbour/contrib/hbqt/qtcore/qth/QLibraryInfo.qth b/harbour/contrib/hbqt/qtcore/qth/QLibraryInfo.qth new file mode 100644 index 0000000000..dfd194d12c --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/qth/QLibraryInfo.qth @@ -0,0 +1,69 @@ +/* + * $Id$ + */ + +/* + * Harbour Qt wrapper generator control file + * + * Copyright 2009-2010 Pritpal Bedi + * www - http://www.harbour-project.org + * + * See COPYING for licensing terms. + */ + + +QObject = no +Inherits = +Type = +New = +Constructor = + + + + + + + + + +#include +#include + + +/* + * + * + */ +HB_FUNC( QT_QLIBRARYINFO ) +{ + __HB_RETPTRGC__( NULL ); +} + + + +enum LibraryLocation { PrefixPath, DocumentationPath, HeadersPath, LibrariesPath, BinariesPath, PluginsPath, ImportsPath, DataPath, TranslationsPath, SettingsPath, ExamplesPath, DemosPath } + + + +QDate buildDate (){ + hbqt_create_objectGC( hbqt_gcAllocate_QDate( new QDate( QLibraryInfo::buildDate() ), true ) , "HB_QDATE" ); +} +QString buildKey (){ + hb_retstr_utf8( QLibraryInfo::buildKey().toUtf8().data() ); +} +QString licensedProducts (){ + hb_retstr_utf8( QLibraryInfo::licensedProducts().toUtf8().data() ); +} +QString licensee (){ + hb_retstr_utf8( QLibraryInfo::licensee().toUtf8().data() ); +} +QString location ( LibraryLocation loc ){ + hb_retstr_utf8( QLibraryInfo::location( ( QLibraryInfo::LibraryLocation ) hb_parni( 1 ) ).toUtf8().data() ); +} + + + + + + + diff --git a/harbour/contrib/hbqt/qtcore/qth/filelist.hbm b/harbour/contrib/hbqt/qtcore/qth/filelist.hbm index 66fc97afbf..e243bdd741 100644 --- a/harbour/contrib/hbqt/qtcore/qth/filelist.hbm +++ b/harbour/contrib/hbqt/qtcore/qth/filelist.hbm @@ -36,6 +36,7 @@ QLatin1String.qth QLine.qth QLineF.qth QList.qth +QLibraryInfo.qth QLocale.qth QMetaClassInfo.qth QMetaEnum.qth