diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a3db284a98..24fdfb58d9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,15 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-08 09:48 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/gtqtc/gtqtcs.hbc + * contrib/hbqt/gtqtc/gtqtc.hbc + * contrib/hbqt/hbqt.hbc + * contrib/hbqt/hbqts.hbc + + Updated static .hbc file for OS/2 + % Removed little redundancy in libpaths= lines. + % Deleted qtwebkit and qtnetwork references from gtqt*.hbc files. + 2010-03-07 21:30 UTC-0600 David Arturo Macias Corona (dmacias/at/mail.udg.mx) * harbour/contrib/hbqt/hbqt.hbc * harbour/contrib/hbqt/gtqtc/gtqtc.hbc diff --git a/harbour/contrib/hbqt/gtqtc/gtqtc.hbc b/harbour/contrib/hbqt/gtqtc/gtqtc.hbc index 6d648c3455..d3f4a47c6b 100644 --- a/harbour/contrib/hbqt/gtqtc/gtqtc.hbc +++ b/harbour/contrib/hbqt/gtqtc/gtqtc.hbc @@ -2,16 +2,12 @@ # $Id$ # -{allwin}libpaths=${HB_WITH_QT}\..\lib -{os2}libpaths=${HB_WITH_QT}\..\lib +{allwin|os2}libpaths=${HB_WITH_QT}\..\lib -{allwin}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4 -{os2}libs=QtCore4 QtGui4 QtNet4 -{linux}libs=QtCore QtGui QtNetwork QtWebKit +{allwin|os2}libs=QtCore4 QtGui4 +{linux}libs=QtCore QtGui {darwin}libs=/Library/Frameworks/QtCore.framework/QtCore {darwin}libs=/Library/Frameworks/QtGui.framework/QtGui -{darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork -{darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit {allgcc}libs=supc++ {win|os2}hbcppmm=yes diff --git a/harbour/contrib/hbqt/gtqtc/gtqtcs.hbc b/harbour/contrib/hbqt/gtqtc/gtqtcs.hbc index 324a10949e..f4565c49c3 100644 --- a/harbour/contrib/hbqt/gtqtc/gtqtcs.hbc +++ b/harbour/contrib/hbqt/gtqtc/gtqtcs.hbc @@ -2,9 +2,9 @@ # $Id$ # -{allwin}libpaths=${HB_WITH_QT}\..\lib +{allwin|os2}libpaths=${HB_WITH_QT}\..\lib -libs=QtCore QtGui QtNetwork QtWebKit +libs=QtCore QtGui {allgcc}libs=supc++ hbcppmm=yes diff --git a/harbour/contrib/hbqt/hbqt.hbc b/harbour/contrib/hbqt/hbqt.hbc index 71260e05eb..6434a8dda4 100644 --- a/harbour/contrib/hbqt/hbqt.hbc +++ b/harbour/contrib/hbqt/hbqt.hbc @@ -4,8 +4,7 @@ incpaths=. -{allwin}libpaths=${HB_WITH_QT}\..\lib -{os2}libpaths=${HB_WITH_QT}\..\lib +{allwin|os2}libpaths=${HB_WITH_QT}\..\lib libs=hbqt libs=hbqtcore hbqtgui hbqtnetwork diff --git a/harbour/contrib/hbqt/hbqts.hbc b/harbour/contrib/hbqt/hbqts.hbc index 9c2634116c..e6a81bf17e 100644 --- a/harbour/contrib/hbqt/hbqts.hbc +++ b/harbour/contrib/hbqt/hbqts.hbc @@ -4,7 +4,7 @@ incpaths=. -{allwin}libpaths=${HB_WITH_QT}\..\lib +{allwin|os2}libpaths=${HB_WITH_QT}\..\lib libs=hbqts libs=hbqtcores hbqtguis hbqtnetworks hbqtwebkits