From d09d9352705a2a871642abf20f4f825f5dc255a3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 3 Aug 2010 07:55:44 +0000 Subject: [PATCH] 2010-08-03 09:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtgui/hbqtgui.hbc * contrib/hbqt/qtwebkit/hbqtwebkit.hbc * contrib/hbqt/qtcore/hbqtcore.hbc * contrib/hbqt/qtnetwork/hbqtnetwork.hbc * contrib/hbqt/qscintilla/hbqscintilla.hbc * contrib/hbqt/qtdesigner/hbqtdesigner.hbc - Deleted hack not required anymore after '2010-08-03 09:07 UTC+0200 Viktor Szakats' * contrib/hbqt/hbqt.hbp - Commented qtwebkit and qtdesigner sub-components. qtwebkit still isn't available on several systems (Linux f.e.), so pbly extra dependency detection should be added, and qtdesigner is not used. Seeing lack of positive reaction about these components (and recent moves whatsoever), it's better to concentrate on more interesting things now and not waste more CPU/brain cycles on that. BTW if someone is interested in them, they can be built using .hbp file, pls send patches if you find them broken. --- harbour/ChangeLog | 19 +++++++++++++++++++ harbour/contrib/hbqt/hbqt.hbp | 4 ++-- .../contrib/hbqt/qscintilla/hbqscintilla.hbc | 4 ++-- harbour/contrib/hbqt/qtcore/hbqtcore.hbc | 4 ++-- .../contrib/hbqt/qtdesigner/hbqtdesigner.hbc | 4 ++-- harbour/contrib/hbqt/qtgui/hbqtgui.hbc | 4 ++-- .../contrib/hbqt/qtnetwork/hbqtnetwork.hbc | 4 ++-- harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc | 4 ++-- 8 files changed, 33 insertions(+), 14 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0b1ede0253..ecc74fd4bd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,25 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-03 09:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtgui/hbqtgui.hbc + * contrib/hbqt/qtwebkit/hbqtwebkit.hbc + * contrib/hbqt/qtcore/hbqtcore.hbc + * contrib/hbqt/qtnetwork/hbqtnetwork.hbc + * contrib/hbqt/qscintilla/hbqscintilla.hbc + * contrib/hbqt/qtdesigner/hbqtdesigner.hbc + - Deleted hack not required anymore after '2010-08-03 09:07 UTC+0200 Viktor Szakats' + + * contrib/hbqt/hbqt.hbp + - Commented qtwebkit and qtdesigner sub-components. qtwebkit + still isn't available on several systems (Linux f.e.), so pbly extra + dependency detection should be added, and qtdesigner is not used. + Seeing lack of positive reaction about these components (and recent + moves whatsoever), it's better to concentrate on more interesting + things now and not waste more CPU/brain cycles on that. + BTW if someone is interested in them, they can be built using .hbp file, + pls send patches if you find them broken. + 2010-08-03 09:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbgtcore.h * include/hbapifs.h diff --git a/harbour/contrib/hbqt/hbqt.hbp b/harbour/contrib/hbqt/hbqt.hbp index b36f7496fb..13e4bb054b 100644 --- a/harbour/contrib/hbqt/hbqt.hbp +++ b/harbour/contrib/hbqt/hbqt.hbp @@ -10,7 +10,7 @@ -hbcontainer hbqtcore.hbc -hbqtdesigner.hbc +# hbqtdesigner.hbc hbqtgui.hbc hbqtnetwork.hbc -hbqtwebkit.hbc +# hbqtwebkit.hbc diff --git a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc index e4975037cc..e1d7e84f1a 100644 --- a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc +++ b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc @@ -16,10 +16,10 @@ incpaths=g -depcontrol=qscintilla:${HB_WITH_QSCINTILLA} # NOTE: untested -{!HB_STATIC_QT&!hbdyn}libs=hbqscintilla${__HB_DYN__} +{!HB_STATIC_QT}libs=hbqscintilla${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=qscintilla2 QSci_Qt4 {!HB_STATIC_QT&linux}libs=qscintilla2 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/qscintilla2.framework/qscintilla2 -{HB_STATIC_QT&allwin&!hbdyn}libs=hbqscintillas${__HB_DYN__} +{HB_STATIC_QT&allwin}libs=hbqscintillas${__HB_DYN__} {HB_STATIC_QT&linux}libs=hbqscintilla {HB_STATIC_QT&(allwin|linux)}libs=qscintilla2 diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc index fb1e0697c4..6ddd91756e 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc @@ -13,10 +13,10 @@ incpaths=. incpaths=g # TOFIX: QtGui is needed by hbqt_hbslots.cpp. This dependency should be removed. -{!HB_STATIC_QT&!hbdyn}libs=hbqtcore${__HB_DYN__} +{!HB_STATIC_QT}libs=hbqtcore${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtCore4 QtGui4 {!HB_STATIC_QT&linux}libs=QtCore QtGui {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore /Library/Frameworks/QtGui.framework/QtGui -{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtcores${__HB_DYN__} +{HB_STATIC_QT&allwin}libs=hbqtcores${__HB_DYN__} {HB_STATIC_QT&linux}libs=hbqtcore {HB_STATIC_QT&(allwin|linux)}libs=QtCore QtGui diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc index 2197111eb2..85777734ea 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc @@ -12,10 +12,10 @@ libs=../qtgui/hbqtgui.hbc incpaths=g -{!HB_STATIC_QT&!hbdyn}libs=hbqtdesigner${__HB_DYN__} +{!HB_STATIC_QT}libs=hbqtdesigner${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtDesigner4 {!HB_STATIC_QT&linux}libs=QtDesigner {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtDesigner.framework/QtDesigner -{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtdesigners${__HB_DYN__} +{HB_STATIC_QT&allwin}libs=hbqtdesigners${__HB_DYN__} {HB_STATIC_QT&linux}libs=hbqtdesigner {HB_STATIC_QT&(allwin|linux)}libs=QtDesigner diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc index 39d50e52b2..9b249a495c 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc @@ -11,12 +11,12 @@ libs=../qtcore/hbqtcore.hbc incpaths=g -{!HB_STATIC_QT&!hbdyn}libs=hbqtgui${__HB_DYN__} +{!HB_STATIC_QT}libs=hbqtgui${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtGui4 {!HB_STATIC_QT&linux}libs=QtGui {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtGui.framework/QtGui {!HB_STATIC_QT}libs=QtUiTools -{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtguis${__HB_DYN__} +{HB_STATIC_QT&allwin}libs=hbqtguis${__HB_DYN__} {HB_STATIC_QT&linux}libs=hbqtgui {HB_STATIC_QT&(allwin|linux)}libs=QtGui {HB_STATIC_QT&(allwin|linux)}libs=QtUiTools diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc index cffe4c3681..1646ee9836 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc @@ -11,10 +11,10 @@ libs=../qtcore/hbqtcore.hbc incpaths=g -{!HB_STATIC_QT&!hbdyn}libs=hbqtnetwork${__HB_DYN__} +{!HB_STATIC_QT}libs=hbqtnetwork${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtNetwork4 {!HB_STATIC_QT&linux}libs=QtNetwork {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork -{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtnetworks${__HB_DYN__} +{HB_STATIC_QT&allwin}libs=hbqtnetworks${__HB_DYN__} {HB_STATIC_QT&linux}libs=hbqtnetwork {HB_STATIC_QT&(allwin|linux)}libs=QtNetwork diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc index 1f7ab39632..827ddffda7 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc @@ -13,10 +13,10 @@ libs=../qtnetwork/hbqtnetwork.hbc incpaths=g -{!HB_STATIC_QT&!hbdyn}libs=hbqtwebkit${__HB_DYN__} +{!HB_STATIC_QT}libs=hbqtwebkit${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtWebKit4 {!HB_STATIC_QT&linux}libs=QtWebKit {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit -{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtwebkits${__HB_DYN__} +{HB_STATIC_QT&allwin}libs=hbqtwebkits${__HB_DYN__} {HB_STATIC_QT&linux}libs=hbqtwebkit {HB_STATIC_QT&(allwin|linux)}libs=QtWebKit