fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2013-04-29 12:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/gtqtc/gtqtc.hbc
* contrib/gtqtc/hbmk2_qtmoc.hb
+ Prepared to be compiled also with Qt version 5.0 onwards.
This commit is contained in:
Pritpal Bedi
2013-04-29 12:55:02 -07:00
parent 17a281f651
commit 3cbab2da86
3 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog.txt
View File

@@ -1,5 +1,5 @@
/*
* $Id$
/*
* $Id: 39c2022b211f3c508b3772c7a73ff7bb7de90e35 $
*/
/* Read doc/howtorep.txt and use this format for entry headers:
@@ -10,6 +10,11 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-04-29 12:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/gtqtc/gtqtc.hbc
* contrib/gtqtc/hbmk2_qtmoc.hb
+ Prepared to be compiled also with Qt version 5.0 onwards.
2013-04-29 01:15 UTC+0200 Tamas TEVESZ (ice extreme.hu)
* doc/en/memo.txt
! Fix pastos in MemoWrit()/hb_MemoWrit() argument description
@@ -66,12 +71,12 @@
* src/3rd/png/Makefile
! disable stdio in WinCE builds by PNG_NO_STDIO macro
2013-04-25 12:18 UTC+0200 Przemysław Czerpak (druzus/at/poczta.onet.pl)
2013-04-25 12:18 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/hbgtcore.c
! updated INKEYPOOL() code to respect extended key code in ALT+C and
ALT+D detection
2013-04-24 23:58 UTC+0200 Przemysław Czerpak (druzus/at/poczta.onet.pl)
2013-04-24 23:58 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
- contrib/gtqtc/gtqtc.cpp
+ contrib/gtqtc/gtqtc1.cpp
* contrib/gtqtc/gtqtc.hbp
@@ -85,7 +90,7 @@
DBUSEAREA(,, "SELECT * FOM syntax_error")
* changed ADS error description to be much more informative
2013-04-24 12:22 UTC+0200 Przemysław Czerpak (druzus/at/poczta.onet.pl)
2013-04-24 12:22 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+ contrib/gtqtc/hbmk2_qtmoc.hb
* contrib/hbplist.txt
* .gitattributes
@@ -157,7 +162,7 @@
bar for both indexing and SQL query processing.
; implementation unchanged for old ADS versions (<= 6.1)
2013-04-22 22:05 UTC+0200 Przemysław Czerpak (druzus/at/poczta.onet.pl)
2013-04-22 22:05 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* bin/check.hb
* bin/commit.hb
! added executable attribute
@@ -178,7 +183,7 @@
Now recently created problems like broken *nix builds can be well
seen in stderr output.
2013-04-22 15:38 UTC+0200 Przemysław Czerpak (druzus/at/poczta.onet.pl)
2013-04-22 15:38 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbapi.h
* include/hbapigt.h
* include/hbvm.h
@@ -302,7 +307,7 @@
* contrib/hbpgsql/rddcopy.c
* removed unused assignment
2013-04-18 14:58 UTC+0200 Przemysław Czerpak (druzus/at/poczta.onet.pl)
2013-04-18 14:58 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* .gitignore
! removed executable file permission

11
contrib/gtqtc/gtqtc.hbc
View File

@@ -4,9 +4,14 @@ description=Multi-Platform QT based GUI console (QTC)
gt=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
{allwin|os2}libpaths=${HB_WITH_QT}/../lib
{allwin|os2}libs=QtCore4 QtGui4
{linux|beos|symbian}libs=QtCore QtGui
{darwin}frameworks=QtCore QtGui
{(HB_QT_MAJOR_VER='4')&(allwin|os2)}libs=QtCore4 QtGui4
{(HB_QT_MAJOR_VER='4')&(linux|beos|symbian)}libs=QtCore QtGui
{(HB_QT_MAJOR_VER='4')&(darwin)}frameworks=QtCore QtGui
{(HB_QT_MAJOR_VER='5')&(allwin|os2)}libs=Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport
{(HB_QT_MAJOR_VER='5')&(linux|beos|symbian)}libs=QtCore QtGui QtWidgets QtPrintSupport
{(HB_QT_MAJOR_VER='5')&(darwin)}frameworks=QtCore QtGui QtWidgets QtPrintSupport
cpp=yes
gui=yes

22
contrib/gtqtc/hbmk2_qtmoc.hb
View File

@@ -38,6 +38,7 @@ FUNCTION hbmk_plugin_qt( hbmk )
LOCAL cDst
LOCAL tSrc
LOCAL tDst
LOCAL cTmp
LOCAL cCommand
LOCAL nError
@@ -48,6 +49,15 @@ FUNCTION hbmk_plugin_qt( hbmk )
hbmk_Register_Input_File_Extension( hbmk, ".h" )
IF Empty( GetEnv( "HB_QT_MAJOR_VER" ) ) /* To honor Qt 5.0.1 */
cTmp := qt_version_detect( hbmk, "uic", "UIC_BIN" )
IF " 5." $ cTmp
hb_SetEnv( "HB_QT_MAJOR_VER", "5" )
ELSE
hb_SetEnv( "HB_QT_MAJOR_VER", "4" )
ENDIF
ENDIF
EXIT
CASE "pre_all"
@@ -147,6 +157,18 @@ FUNCTION hbmk_plugin_qt( hbmk )
RETURN cRetVal
STATIC FUNCTION qt_version_detect( hbmk, cName, cEnvQT, lPostfix )
LOCAL cTmp := ""
LOCAL cBIN := qt_tool_detect( hbmk, cName, cEnvQT, lPostfix )
IF ! Empty( cBIN )
hb_processRun( cBIN + " -v",,, @cTmp )
ENDIF
RETURN cTmp
STATIC FUNCTION qt_tool_detect( hbmk, cName, cEnvQT, lPostfix )
LOCAL cBIN
LOCAL cEnv