diff --git a/ChangeLog.txt b/ChangeLog.txt index 6d93a912dc..009fefeccf 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,15 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-01-03 12:39 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/gtqtc/gtqtc.hbc + * contrib/gtqtc/gtqtc.hbp + * updated for QT 5.2 builds on Linux and some other *nixes + ; TODO: update Mac OSX builds. + + * contrib/gtqtc/gtqtc1.cpp + ! removed Qt::WA_PaintOnScreen + 2014-01-02 18:41 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/vm/hvm.c * clear STATIC variables before releasing thread specific data. diff --git a/contrib/gtqtc/gtqtc.hbc b/contrib/gtqtc/gtqtc.hbc index 0551437da2..08093dca65 100644 --- a/contrib/gtqtc/gtqtc.hbc +++ b/contrib/gtqtc/gtqtc.hbc @@ -15,11 +15,10 @@ depfinish=qt5 {darwin}depincpath=qt:/usr/local/include {darwin}depfinish=qt -{allwin|os2}libpaths=${HB_WITH_QT}/../lib +{(allwin|os2)|HB_WITH_QT}libpaths=${HB_WITH_QT}/../lib {(allwin|os2)&!HBMK_HAS_QT5}libs=QtCore4 QtGui4 -{(allwin|os2)&HBMK_HAS_QT5}libs=Qt5Core Qt5Gui Qt5Widgets -{linux|beos|symbian}libs=QtCore QtGui -{(linux|beos|symbian)&HBMK_HAS_QT5}libs=QtWidgets +{(allwin|os2|linux|beos|symbian)&HBMK_HAS_QT5}libs=Qt5Core Qt5Gui Qt5Widgets +{(linux|beos|symbian)&!HBMK_HAS_QT5}libs=QtCore QtGui {darwin}ldflags=-F${HBMK_DIR_QT}/../lib {darwin}frameworks=QtCore QtGui {darwin&HBMK_HAS_QT5}frameworks=QtWidgets diff --git a/contrib/gtqtc/gtqtc.hbp b/contrib/gtqtc/gtqtc.hbp index d221415ff4..f6f7e0840a 100644 --- a/contrib/gtqtc/gtqtc.hbp +++ b/contrib/gtqtc/gtqtc.hbp @@ -8,20 +8,27 @@ -stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64|pcc} +-pic + -plugin=hbmk2_qtmoc.hb -{!android}-deppkgname=qt:QtCore --depkeyhead=qt:QtCore/qglobal.h --depcontrol=qt:no{HB_BUILD_3RDEXT='no'} --depcontrol=qt:${HB_WITH_QT} -{!darwin&!android}-depincpath=qt:/usr/include/qt4 -{!darwin&!android}-depincpath=qt:/usr/lib/qt4/include -{!darwin&!android}-depincpath=qt:/usr/include -{bsd}-depincpath=qt:/usr/local/include/qt4 +-depcontrol=qt5:${HB_WITH_QT} +-depkeyhead=qt5:QtCore/QJsonObject +-depoptional=qt5:yes +-depfinish=qt5 + +{!HBMK_HAS_QT5&!android}-deppkgname=qt:QtCore +{!HBMK_HAS_QT5}-depkeyhead=qt:QtCore/qglobal.h +{!HBMK_HAS_QT5}-depcontrol=qt:no{HB_BUILD_3RDEXT='no'} +{!HBMK_HAS_QT5}-depcontrol=qt:${HB_WITH_QT} +{!HBMK_HAS_QT5&!darwin&!android}-depincpath=qt:/usr/include/qt4 +{!HBMK_HAS_QT5&!darwin&!android}-depincpath=qt:/usr/lib/qt4/include +{!HBMK_HAS_QT5&!darwin&!android}-depincpath=qt:/usr/include +{!HBMK_HAS_QT5&bsd}-depincpath=qt:/usr/local/include/qt4 +{!HBMK_HAS_QT5&beos}-depincpath=qt:/boot/common/include {darwin}-depincpath=qt:/Developer/qt/include {darwin}-depincpath=qt:/Library/Frameworks {darwin}-depincpath=qt:/usr/local/include -{beos}-depincpath=qt:/boot/common/include gtqtc1.cpp gtqtc.h diff --git a/contrib/gtqtc/gtqtc1.cpp b/contrib/gtqtc/gtqtc1.cpp index 33a4073043..2a7aee9531 100644 --- a/contrib/gtqtc/gtqtc1.cpp +++ b/contrib/gtqtc/gtqtc1.cpp @@ -2460,7 +2460,6 @@ QTConsole::QTConsole( PHB_GTQTC pStructQTC, QWidget *parent ) : QWidget( parent timer = NULL; setAttribute( Qt::WA_StaticContents ); - setAttribute( Qt::WA_PaintOnScreen ); setAttribute( Qt::WA_OpaquePaintEvent ); setAttribute( Qt::WA_KeyCompression );