2010-12-12 00:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbqt/hbqt_hbmk2_plugin.hbs
    + Showing -v output (version string) of detected QT tools in -info mode.

  * contrib/make.hbs
    ! Typo.

harbour/ChangeLog

@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-12-12 00:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/hbqt_hbmk2_plugin.hbs
+    + Showing -v output (version string) of detected QT tools in -info mode.
+
+  * contrib/make.hbs
+    ! Typo.
+
 2010-12-11 23:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     + Added uncrustify to tool lists.

harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs

@@ -405,6 +405,7 @@ FUNCTION hbmk2_plugin_qt( hbmk2 )
 STATIC FUNCTION qt_tool_detect( hbmk2, cName, cEnvQT, lPostfix )
    LOCAL cBIN
    LOCAL aEnvList
+   LOCAL cStdErr
 
    IF ! hb_isLogical( lPostfix )
       lPostfix := .T.
@@ -457,7 +458,14 @@ STATIC FUNCTION qt_tool_detect( hbmk2, cName, cEnvQT, lPostfix )
          ENDIF
       ENDIF
       IF hbmk2[ "lINFO" ]
-         hbmk2_OutStd( hbmk2, hb_StrFormat( "Using QT '%1$s' executable: %2$s (autodetected)", cName, cBIN ) )
+         cStdErr := ""
+         IF ! hbmk2[ "lDONTEXEC" ]
+            hb_processRun( cBIN + " -v",,, @cStdErr )
+            IF ! Empty( cStdErr )
+               cStdErr := " [" + StrTran( StrTran( cStdErr, Chr( 13 ) ), Chr( 10 ) ) + "]"
+            ENDIF
+         ENDIF
+         hbmk2_OutStd( hbmk2, hb_StrFormat( "Using QT '%1$s' executable: %2$s%3$s (autodetected)", cName, cBIN, cStdErr ) )
       ENDIF
    ENDIF
 

harbour/contrib/make.hbs

@@ -560,7 +560,7 @@ STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, cDynSuffix, cStdErr, cStd
                cOptionsLibDyn
 
    IF PCount() >= 4
-      nErrorLevel := hb_processRun( cCommand, @cStdErr, @cStdOut )
+      nErrorLevel := hb_processRun( cCommand,, @cStdOut, @cStdErr )
    ELSE
       nErrorLevel := mk_hb_processRun( cCommand )
    ENDIF