Do not build tqassistantclient for native tqt build
Embed static qassistantclient library for qt3 build
(cherry picked from commit b67c2e559a69620288450b2140152cd231d2dcfd)

diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
index 64fbb38..e2eb32b 100644
--- a/qtinterface/CMakeLists.txt
+++ b/qtinterface/CMakeLists.txt
@@ -199,10 +199,31 @@
 ##### tqassistantclient (shared) ##############################
 
 
-tde_add_library( tqassistantclient SHARED
-  SOURCES
-    tqassistantclient.cpp
-  VERSION 4.2.0
-  LINK ${QT_LIBRARIES} -lqassistantclient
-  DESTINATION ${LIB_INSTALL_DIR}
-)
+  find_library( QASSISTANTCLIENT_STATIC libqassistantclient.a )
+
+  if ( QASSISTANTCLIENT_STATIC )
+
+    add_library(qassistantclient STATIC IMPORTED)
+    set_property(TARGET qassistantclient PROPERTY
+                 IMPORTED_LOCATION ${QASSISTANTCLIENT_STATIC})
+
+    tde_add_library( tqassistantclient SHARED
+      SOURCES
+        tqassistantclient.cpp
+      VERSION 4.2.0
+      LINK ${QT_LIBRARIES}
+      EMBED qassistantclient
+      DESTINATION ${LIB_INSTALL_DIR}
+    )
+
+  else ( QASSISTANTCLIENT_STATIC )
+
+    tde_add_library( tqassistantclient SHARED
+      SOURCES
+        tqassistantclient.cpp
+      VERSION 4.2.0
+      LINK ${QT_LIBRARIES} -lqassistantclient
+      DESTINATION ${LIB_INSTALL_DIR}
+    )
+
+  endif ( QASSISTANTCLIENT_STATIC )

Fix hard-coded location for pkgconfig file.
(cherry picked from commit 4b1e77c3601d4878cc8285cae4396be410f8e604)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00891dc..ee86b22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@
 tde_setup_install_path( BIN_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/bin"  )
 tde_setup_install_path( LIB_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
 tde_setup_install_path( INCLUDE_INSTALL_DIR   "${CMAKE_INSTALL_PREFIX}/include/tqt" )
-tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" )
+tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" )
 
 
 ##### tqtinterface sources ######################

Add missing shebang in bash script
(cherry picked from commit b79cc765ed9b03e20f244f585673ab99ede7cff1)

diff --git a/qtinterface/convert_qt_tqt1 b/qtinterface/convert_qt_tqt1
index 1b36f80..e65f144 100755
--- a/qtinterface/convert_qt_tqt1
+++ b/qtinterface/convert_qt_tqt1
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)q1xcompatibility\.h/\1tq1xcompatibility\.h/g' {} \;
 find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)q1xcompatibility\.h/\1tq1xcompatibility\.h/g' {} \;
 find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qabstractlayout\.h/\1tqabstractlayout\.h/g' {} \;