2010-06-04 00:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbqt/hbqt_common.hbm
    * Unfinished changes to sync darwin with rest of platforms.

  * contrib/hbqt/plug_moc.prg
    ! Missed to look in PATH to find moc tool.

  * utils/hbmk2/hbmk2.prg
    ! Fixed to handle -depcontrol=<path> case.

harbour/ChangeLog

@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-06-04 00:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/hbqt_common.hbm
+    * Unfinished changes to sync darwin with rest of platforms.
+
+  * contrib/hbqt/plug_moc.prg
+    ! Missed to look in PATH to find moc tool.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed to handle -depcontrol=<path> case.
+
 2010-06-03 23:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     * Minor cleanup to previous commits.

harbour/contrib/hbqt/hbqt_common.hbm

@@ -12,15 +12,13 @@
 
 -plugin=plug_moc.prg
 
+-depkeyhead=qt:QtCore/qglobal.h
 -depcontrol=qt:${HB_WITH_QT}
 
-{!darwin}-depkeyhead=qt:QtCore/qglobal.h
 {!darwin}-depincpath=qt:/usr/include/qt4
 {!darwin}-depincpath=qt:/usr/lib/qt4/include
 {!darwin}-depincpath=qt:/usr/include
 {!darwin}-depincpath=qt:/Developer/qt/include
 
-# TOFIX: Use the same header for detection on darwin
-{darwin}-depkeyhead=qt:QtCore
 {darwin}-depincpath=qt:/Library/Frameworks/QtCore.framework/Headers
 {darwin}-cflag=-I/Library/Frameworks/QtCore.framework/Headers

harbour/contrib/hbqt/plug_moc.prg

@@ -54,9 +54,9 @@ FUNCTION hbmk2_plugin_moc( hbmk2 )
                      RETURN NIL
                   ENDIF
                ELSE
-                  cMOC_BIN := hbmk2_FindInPath( "moc", "/opt/qtsdk/qt/bin" )
+                  cMOC_BIN := hbmk2_FindInPath( "moc", GetEnv( "PATH" ) + hb_osPathListSeparator() + "/opt/qtsdk/qt/bin" )
                   IF Empty( cMOC_BIN )
-                     cMOC_BIN := hbmk2_FindInPath( "moc-qt4", "/opt/qtsdk/qt/bin" )
+                     cMOC_BIN := hbmk2_FindInPath( "moc-qt4", GetEnv( "PATH" ) + hb_osPathListSeparator() + "/opt/qtsdk/qt/bin" )
                      IF Empty( cMOC_BIN )
                         hbmk2_OutErr( hbmk2, "HB_QT_MOC_BIN not set, could not autodetect" )
                         RETURN NIL

harbour/utils/hbmk2/hbmk2.prg

@@ -5988,6 +5988,8 @@ STATIC PROCEDURE dep_postprocess( hbmk )
          dep[ _HBMKDEP_lForced ] := .T.
          AAdd( hbmk[ _HBMK_aOPTC ], "-D" + _HBMK_HAS_PREF + StrToDefine( dep:__enumKey() ) )
          EXIT
+      OTHERWISE
+         AAddNew( dep[ _HBMKDEP_aINCPATH ], dep[ _HBMKDEP_cControl ] )
       ENDSWITCH
    NEXT