From 7ba5a4186762f55bd26919f227328da5c8445515 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <vszakats@users.noreply.github.com>
Date: Wed, 13 Sep 2017 12:50:32 +0000
Subject: [PATCH] 2017-09-13 12:49 UTC Viktor Szakats (vszakats
 users.noreply.github.com)   * contrib/gtqtc/gtqtc.hbp   *
 contrib/hbssl/ssl_hbcon.prg   * contrib/gtqtc/hbmk2_qtmoc.hb ->
 contrib/gtqtc/hbmk2_qtgt.hb     * more syncs with 3.4 fork. One rename, some
 content syncs       after renames.

---
 ChangeLog.txt                                  |  7 +++++++
 contrib/gtqtc/gtqtc.hbp                        |  2 +-
 .../gtqtc/{hbmk2_qtmoc.hb => hbmk2_qtgt.hb}    | 18 +++++++++++-------
 contrib/hbssl/ssl_hbcon.prg                    |  8 ++++----
 4 files changed, 23 insertions(+), 12 deletions(-)
 rename contrib/gtqtc/{hbmk2_qtmoc.hb => hbmk2_qtgt.hb} (92%)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 212b72c8bb..8f9eb05a29 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,13 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2017-09-13 12:49 UTC Viktor Szakats (vszakats users.noreply.github.com)
+  * contrib/gtqtc/gtqtc.hbp
+  * contrib/hbssl/ssl_hbcon.prg
+  * contrib/gtqtc/hbmk2_qtmoc.hb -> contrib/gtqtc/hbmk2_qtgt.hb
+    * more syncs with 3.4 fork. One rename, some content syncs
+      after renames.
+
 2017-09-13 12:41 UTC Viktor Szakats (vszakats users.noreply.github.com)
   * contrib/hbmxml/3rd/minixml/mxml.hbp
   * contrib/hbmxml/3rd/minixml/minixml.diff -> contrib/hbmxml/3rd/minixml/mxml.diff
diff --git a/contrib/gtqtc/gtqtc.hbp b/contrib/gtqtc/gtqtc.hbp
index 3e7c3a5513..51cbdf69a5 100644
--- a/contrib/gtqtc/gtqtc.hbp
+++ b/contrib/gtqtc/gtqtc.hbp
@@ -9,7 +9,7 @@
 
 -pic
 
--plugin=hbmk2_qtmoc.hb
+-plugin=hbmk2_qtgt.hb
 
 -depcontrol=qt5:${HB_WITH_QT}
 -depkeyhead=qt5:QtCore/QJsonObject
diff --git a/contrib/gtqtc/hbmk2_qtmoc.hb b/contrib/gtqtc/hbmk2_qtgt.hb
similarity index 92%
rename from contrib/gtqtc/hbmk2_qtmoc.hb
rename to contrib/gtqtc/hbmk2_qtgt.hb
index ed4dc93d56..41b8108711 100644
--- a/contrib/gtqtc/hbmk2_qtmoc.hb
+++ b/contrib/gtqtc/hbmk2_qtgt.hb
@@ -14,9 +14,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
- * their web site at https://www.gnu.org/).
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * (or visit their website at https://www.gnu.org/licenses/).
  *
  */
 
@@ -31,6 +31,7 @@
 #define I_( x )                 hb_i18n_gettext( x )
 
 FUNCTION hbmk_plugin_qt( hbmk )
+
    LOCAL cRetVal := ""
 
    LOCAL cSrc
@@ -146,7 +147,7 @@ FUNCTION hbmk_plugin_qt( hbmk )
 
    RETURN cRetVal
 
-STATIC FUNCTION qt_tool_detect( hbmk, cName, cEnvQT, lPostfix )
+STATIC FUNCTION qt_tool_detect( hbmk, cName, cEnvQT, lSuffix )
    LOCAL cBIN
    LOCAL cEnv
    LOCAL aEnvList
@@ -155,9 +156,12 @@ STATIC FUNCTION qt_tool_detect( hbmk, cName, cEnvQT, lPostfix )
    cBIN := GetEnv( cEnvQT )
    IF Empty( cBIN )
 
-      IF lPostfix
-         cName += GetEnv( "HB_QTPOSTFIX" )
-         aEnvList := { "HB_QTPATH", "HB_QTPOSTFIX" }
+      IF lSuffix
+         IF ! ( cEnv := GetEnv( "HB_QTPOSTFIX" ) ) == ""  /* Compatibility */
+            hb_SetEnv( "HB_QTSUFFIX", cEnv )
+         ENDIF
+         cName += GetEnv( "HB_QTSUFFIX" )
+         aEnvList := { "HB_QTPATH", "HB_QTSUFFIX" }
       ELSE
          aEnvList := { "HB_QTPATH" }
       ENDIF
diff --git a/contrib/hbssl/ssl_hbcon.prg b/contrib/hbssl/ssl_hbcon.prg
index f8a9764661..8c5b78df53 100644
--- a/contrib/hbssl/ssl_hbcon.prg
+++ b/contrib/hbssl/ssl_hbcon.prg
@@ -44,7 +44,7 @@
  *
  */
 
-/* hb_SSL_new() -> <pSSL> */
+/* hb_SSL_new() --> <pSSL> */
 FUNCTION hb_SSL_new()
 
    STATIC s_onceControl
@@ -56,14 +56,14 @@ FUNCTION hb_SSL_new()
    /* create a new SSL structure for a connection */
    RETURN SSL_new( SSL_CTX_new() )
 
-/* hb_SSL_connect_socket( <pSocket>, [ <nTimeOut> ], [ @<cInfo> ] ) -> <lConnected> */
+/* hb_SSL_connect_socket( <pSocket>, [ <nTimeOut> ], [ @<cInfo> ] ) --> <lConnected> */
 FUNCTION hb_SSL_connect_socket( pSocket, nTimeout, cInfo )
 
    LOCAL nErr
    LOCAL ssl
 
    ssl := hb_SSL_new()
-   IF !Empty( pSocket := hb_socketNewSSL_connect( @pSocket, ssl, nTimeout ) )
+   IF ! Empty( pSocket := hb_socketNewSSL_connect( @pSocket, ssl, nTimeout ) )
       cInfo := "SSL connected with " + SSL_get_cipher( ssl ) + " encryption."
       RETURN .T.
    ENDIF
@@ -73,7 +73,7 @@ FUNCTION hb_SSL_connect_socket( pSocket, nTimeout, cInfo )
                           nErr, ERR_error_string( nErr ) )
    RETURN .F.
 
-/* hb_SSL_connect_inet( <pSocket>, [ <nTimeOut> ], [ @<cInfo> ] ) -> <lConnected> */
+/* hb_SSL_connect_inet( <pSocket>, [ <nTimeOut> ], [ @<cInfo> ] ) --> <lConnected> */
 FUNCTION hb_SSL_connect_inet( pInetSock, nTimeout, cInfo )
 
    LOCAL nResult, nErr