Reset submodule main/dependencies/tqtinterface/admin to latest HEAD

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "admin"]
+	path = admin
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

CMakeLists.txt

@@ -19,15 +19,16 @@ set( TQT_VERSION "${TQT_MAJOR_VERSION}.${TQT_MINOR_VERSION}.${TQT_MICRO_VERSION}
 
 ##### cmake setup ###############################
 
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 3.1 )
 
 include( CheckCXXSourceCompiles )
 
+
+##### include our cmake modules #################
+
 set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEMacros )
 
-include( ConfigureChecks.cmake )
-
 
 ##### install paths setup #######################
 
@@ -35,7 +36,25 @@ tde_setup_install_path( EXEC_INSTALL_PREFIX   "${CMAKE_INSTALL_PREFIX}" )
 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" )
+
+
+##### optional stuff ############################
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
+
+option( WITH_QT3 "Build TQt interface based on Qt3" ${WITH_ALL_OPTIONS} )
+option( WITH_QT4 "Build TQt interface based on Qt4" OFF )
+
+
+##### user requested modules ####################
+
+option( BUILD_ALL "Build all" OFF )
+
+
+##### configure checks ##########################
+
+include( ConfigureChecks.cmake )
 
 
 ##### tqtinterface sources ######################

ConfigureChecks.cmake

@@ -13,11 +13,24 @@ macro( qt_message )
   message( STATUS "${ARGN}" )
 endmacro( )
 
+if( (WITH_QT3 OR USE_QT3) AND (WITH_QT4 OR USE_QT4) )
+  tde_message_fatal( "Options WITH_QT3 and WITH_QT4 are mutually exclusive." )
+endif( )
 
-if( DEFINED USE_QT3 )
+if( WITH_QT3 OR USE_QT3 )
   set( QT_VERSION "3" )
-elseif( DEFINED USE_QT4 )
+elseif( WITH_QT4 OR USE_QT4 )
   set( QT_VERSION "4" )
+  message( AUTHOR_WARNING
+    " ------------------------------------------------------------- \n"
+    " ***  NOTE  *** \n"
+    " \n"
+    " The code for the TQt interface based on Qt4 is not maintained \n"
+    " and the result can cause unexpected problems.\n"
+    " \n"
+    " It is not recommended to build a TQt interface based on Qt4!\n"
+    " ------------------------------------------------------------- \n"
+  )
 endif()
 
 

README

@@ -127,7 +127,7 @@ So, here are some tips on bug reporting:
   older, deprecated versions usually don't get that much attention :-)
 
 * Also the chance is high that another one experienced your problem. The
-  bug report wizard at http://bugs.pearsoncomputing.net will help you to
+  bug report wizard at http://bugs.trinitydesktop.org will help you to
   find out if your problem has already been reported.
 
 * The best bug report for a project based on voluntary work is of course one
@@ -136,4 +136,4 @@ So, here are some tips on bug reporting:
 
 More info
 ---------
-http://trinity.pearsoncomputing.net
+http://www.trinitydesktop.org

admin

@@ -0,0 +1 @@
+Subproject commit 92a6d62b8f8f1836c43b54e3fb13b7ea7bb22e9f

qtinterface/CMakeLists.txt

@@ -199,10 +199,31 @@ tde_add_library( tqt SHARED
 ##### tqassistantclient (shared) ##############################
 
 
-tde_add_library( tqassistantclient SHARED
+  find_library( QASSISTANTCLIENT_STATIC libqassistantclient.a )
-  SOURCES
+
-    tqassistantclient.cpp
+  if ( QASSISTANTCLIENT_STATIC )
-  VERSION 4.2.0
+
-  LINK ${QT_LIBRARIES} -lqassistantclient
+    add_library(qassistantclient STATIC IMPORTED)
-  DESTINATION ${LIB_INSTALL_DIR}
+    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 )

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' {} \;

qtinterface/tmoc.cmake

@@ -12,7 +12,10 @@ if [ -f @BIN_INSTALL_DIR@/tqt-replace-stream ]; then
 		out_file="$3"
 		@BIN_INSTALL_DIR@/tqt-replace-stream "${input_file}" | \
 	        @MOC_EXECUTABLE@ | \
-	        sed "/#include <qmetaobject.h>/ i #undef QT_NO_COMPAT\n#include \"${input_file}\"" \
+	        sed "/#include <qmetaobject.h>/ i\\
+#undef QT_NO_COMPAT\\
+#include \"${input_file}\"\\
+" \
 		> "${out_file}"
 	fi
 else

qtinterface/tqt-replace

@@ -1,7 +1,7 @@
 #!/bin/bash
 QT_VER=X
 
-if [[ $1 == "" ]]; then
+if [[ "$1" == "" ]]; then
 	echo "Usage: tqt-replace <input_file>"
 else
 	if [[ $QT_VER == 3 ]]; then
@@ -11,6 +11,7 @@ else
 		sed -i 's/Q_SLOTS>/slots>/g' "$1"
 		sed -i 's/Q_SIGNALS>/signals>/g' "$1"
 		sed -i 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' "$1"
+		sed -i 's/tqApp/qApp/g' "$1"
 		sed -i 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' "$1"
 		sed -i 's/TQ_PROPERTY/Q_PROPERTY/g' "$1"
 		sed -i 's/TQ_ENUMS/Q_ENUMS/g' "$1"

qtinterface/tqt-replace-stream

@@ -1,15 +1,16 @@
 #!/bin/bash
 QT_VER=X
 
-if [[ $1 == "" ]]; then
+if [[ "$1" == "" ]]; then
 	echo "Usage: tqt-replace-stream <filename>"
 else
 	if [[ $QT_VER == 3 ]]; then
-		cat $1 | \
+		cat "$1" | \
 		sed 's/^TQ\([^T_]\)/Q\1/g' | \
 		sed 's/\([^_]\)TQ\([^T_]\)/\1Q\2/g' | \
 		sed 's/TQT\([^_]\)/QT\1/g' | \
 		sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' | \
+		sed 's/tqApp/qApp/g' | \
 		sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' | \
 		sed 's/TQ_PROPERTY/Q_PROPERTY/g' | \
 		sed 's/TQ_ENUMS/Q_ENUMS/g' | \
@@ -32,7 +33,7 @@ else
 	fi
 
 	if [[ $QT_VER == 4 ]]; then
-		cat $1 | \
+		cat "$1" | \
 		sed 's/TQAccel/Q3Accel/g' | \
 		sed 's/TQAccessible/QAccessible/g' | \
 		sed 's/TQAccessibleObject/QAccessibleObject/g' | \

qtinterface/tqt-replace-stream.cmake

@@ -1,15 +1,16 @@
 #!/bin/bash
 QT_VERSION=@QT_VERSION@
 
-if [[ $1 == "" ]]; then
+if [[ "$1" == "" ]]; then
 	echo "Usage: tqt-replace-stream <filename>"
 else
 	if [[ $QT_VERSION == 3 ]]; then
-		cat $1 | \
+		cat "$1" | \
 		sed 's/^TQ\([^T_]\)/Q\1/g' | \
 		sed 's/\([^_]\)TQ\([^T_]\)/\1Q\2/g' | \
 		sed 's/TQT\([^_]\)/QT\1/g' | \
 		sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' | \
+		sed 's/tqApp/qApp/g' | \
 		sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' | \
 		sed 's/TQ_PROPERTY/Q_PROPERTY/g' | \
 		sed 's/TQ_ENUMS/Q_ENUMS/g' | \
@@ -32,7 +33,7 @@ else
 	fi
 
 	if [[ $QT_VERSION == 4 ]]; then
-		cat $1 | \
+		cat "$1" | \
 		sed 's/TQAccel/Q3Accel/g' | \
 		sed 's/TQAccessible/QAccessible/g' | \
 		sed 's/TQAccessibleObject/QAccessibleObject/g' | \

qtinterface/tqt-replace.cmake

@@ -1,7 +1,7 @@
 #!/bin/bash
 QT_VERSION=@QT_VERSION@
 
-if [[ $1 == "" ]]; then
+if [[ "$1" == "" ]]; then
 	echo "Usage: tqt-replace <input_file>"
 else
 	if [[ $QT_VERSION == 3 ]]; then
@@ -11,6 +11,7 @@ else
 		sed -i 's/Q_SLOTS>/slots>/g' "$1"
 		sed -i 's/Q_SIGNALS>/signals>/g' "$1"
 		sed -i 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' "$1"
+		sed -i 's/tqApp/qApp/g' "$1"
 		sed -i 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' "$1"
 		sed -i 's/TQ_PROPERTY/Q_PROPERTY/g' "$1"
 		sed -i 's/TQ_ENUMS/Q_ENUMS/g' "$1"

qtinterface/uic-tqt

@@ -10,9 +10,13 @@ else
 		fi
 	done
 
-	cp -Rp $uifile $uifile.bkp
+	if [[ "$uifile" != "" ]]; then
-	tqt-replace $uifile
+		cp -Rp $uifile $uifile.bkp
+		tqt-replace $uifile
+	fi
 	uic "$@"
-	cp -Rp $uifile.bkp $uifile
+	if [[ "$uifile" != "" ]]; then
-	rm -f $uifile.bkp
+		cp -Rp $uifile.bkp $uifile
+		rm -f $uifile.bkp
+	fi
 fi