diff --git a/ChangeLog.txt b/ChangeLog.txt
index 42e50e7042..e78de17e2b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,18 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2024-12-17 01:09 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/gtqtc/gtqtc.hbc
+  * contrib/gtqtc/gtqtc.hbp
+    ! fixed dependency macros
+
+  * contrib/gtqtc/hbmk2_qtgt.hb
+    * set QT_SELECT envvar for systems which supports different QT versions
+
+  * utils/hbmk2/hbmk2.prg
+    + added "dept" => hbmk[ _HBMK_hDEPTMACRO ] to hbmk hash table passed to
+      hbmk2 plugins
+
 2024-12-15 20:54 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/gtqtc/gtqtc.h
   * contrib/gtqtc/gtqtc.hbc
diff --git a/contrib/gtqtc/gtqtc.hbc b/contrib/gtqtc/gtqtc.hbc
index 3c9a0e6369..6bb6c2c4cb 100644
--- a/contrib/gtqtc/gtqtc.hbc
+++ b/contrib/gtqtc/gtqtc.hbc
@@ -15,9 +15,9 @@ depfinish=qt6
 {!HBMK_HAS_QT6}depcontrol=qt5:${HB_WITH_QT}
 {!HBMK_HAS_QT6}depkeyhead=qt5:QtCore/QJsonObject
 {!HBMK_HAS_QT6}depoptional=qt5:yes
-{!HBMK_HAS_QT6}depincpath=qt5:/usr/include/x86_64-linux-gnu/qt5{linux}
-{!HBMK_HAS_QT6}depincpath=qt5:/usr/local/opt/qt5/include{darwin}
-{!HBMK_HAS_QT6}depincpath=qt5:/usr/local/include/qt5{bsd}
+{!HBMK_HAS_QT6&linux}depincpath=qt5:/usr/include/x86_64-linux-gnu/qt5
+{!HBMK_HAS_QT6&darwin}depincpath=qt5:/usr/local/opt/qt5/include
+{!HBMK_HAS_QT6&bsd}depincpath=qt5:/usr/local/include/qt5
 {!HBMK_HAS_QT6}depfinish=qt5
 
 {!(HBMK_HAS_QT5|HBMK_HAS_QT6)&!darwin&!android}deppkgname=qt:QtCore
diff --git a/contrib/gtqtc/gtqtc.hbp b/contrib/gtqtc/gtqtc.hbp
index d9ffbf9190..bf02e67d6d 100644
--- a/contrib/gtqtc/gtqtc.hbp
+++ b/contrib/gtqtc/gtqtc.hbp
@@ -36,9 +36,9 @@
 {!HBMK_HAS_QT6}-depcontrol=qt5:${HB_WITH_QT}
 {!HBMK_HAS_QT6&HB_BUILD_3RDEXT='no'}-depoptional=qt5:no
 {!HBMK_HAS_QT6}-depoptional=qt5:yes
-{!HBMK_HAS_QT6}-depincpath=qt5:/usr/include/x86_64-linux-gnu/qt5{linux}
-{!HBMK_HAS_QT6}-depincpath=qt5:/usr/local/opt/qt5/include{darwin}
-{!HBMK_HAS_QT6}-depincpath=qt5:/usr/local/include/qt5{bsd}
+{!HBMK_HAS_QT6&linux}-depincpath=qt5:/usr/include/x86_64-linux-gnu/qt5
+{!HBMK_HAS_QT6&darwin}-depincpath=qt5:/usr/local/opt/qt5/include
+{!HBMK_HAS_QT6&bsd}-depincpath=qt5:/usr/local/include/qt5
 {!HBMK_HAS_QT6}-depfinish=qt5
 
 {!(HBMK_HAS_QT5|HBMK_HAS_QT6)&!darwin&!android}-deppkgname=qt:QtCore
diff --git a/contrib/gtqtc/hbmk2_qtgt.hb b/contrib/gtqtc/hbmk2_qtgt.hb
index 41b8108711..e19ce91aea 100644
--- a/contrib/gtqtc/hbmk2_qtgt.hb
+++ b/contrib/gtqtc/hbmk2_qtgt.hb
@@ -42,6 +42,16 @@ FUNCTION hbmk_plugin_qt( hbmk )
    LOCAL cCommand
    LOCAL nError
    LOCAL lBuildIt
+   LOCAL nQtVer
+
+   IF "dept" $ hbmk
+      nQtVer := iif( "HBMK_HAS_QT4" $ hbmk[ "dept" ], 4, ;
+                iif( "HBMK_HAS_QT5" $ hbmk[ "dept" ], 5, ;
+                iif( "HBMK_HAS_QT6" $ hbmk[ "dept" ], 6, 0 ) ) )
+      IF nQtVer > 0
+         hb_SetEnv( "QT_SELECT", hb_ntos( nQtVer ) )
+      ENDIF
+   ENDIF
 
    SWITCH hbmk[ "cSTATE" ]
    CASE "init"
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index a5fb6d8ffe..dc5bce5588 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -9854,6 +9854,7 @@ STATIC FUNCTION PlugIn_make_ctx( hbmk, cState, hVars )
       "cSTATE"        => cState                     , ;
       "params"        => hbmk[ _HBMK_aPLUGINPars ]  , ;
       "vars"          => hVars                      , ;
+      "dept"          => hbmk[ _HBMK_hDEPTMACRO ]   , ;
       "cPLAT"         => hbmk[ _HBMK_cPLAT ]        , ;
       "cCOMP"         => hbmk[ _HBMK_cCOMP ]        , ;
       "nCOMPVer"      => hbmk[ _HBMK_nCOMPVer ]     , ;