Compare commits

...

77 Commits

Author SHA1 Message Date
Slávek Banko 063badadfb
Remove cmake submodule since it has now been replaced by cmake-trinity dependency. 2 months ago
TDE Gitea 0048f2508a Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 2 months ago
Michele Calgaro ac0f64cf30
Fixed references to TDE website. 6 months ago
TDE Gitea 2bfaedb228 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 5 months ago
TDE Gitea fda201b954 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 6 months ago
TDE Gitea 07a19bb4c0 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 6 months ago
TDE Gitea bf8a812303 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 6 months ago
TDE Gitea 667f535c80 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 6 months ago
TDE Gitea eb7438d695 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 8 months ago
TDE Gitea 8bcc6f4026 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 8 months ago
TDE Gitea 9b504a1c4f Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 10 months ago
TDE Gitea a98c982409 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 10 months ago
TDE Gitea fe687c5f69 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 10 months ago
TDE Gitea 54443a9e16 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 10 months ago
TDE Gitea 681e49de82 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 10 months ago
TDE Gitea e5ebb53ba7 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 10 months ago
Slávek Banko 62d71bc106
Add quotes for the file name used as a parameter in tqt-replace scripts. 11 months ago
TDE Gitea 357da29bcc Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea 3151a28c7d Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea c51a9fe03a Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea 2bafe9b5d1 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 1 year ago
TDE Gitea 940fc07d65 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea 9567a32b8b Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea 57b8a3d737 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea 42650c0b02 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea 3025c19ae0 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 1 year ago
TDE Gitea 8796cb6cf2 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea b7d4795ba2 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea 3e0e5c0e27 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea edce013df9 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea 4a3916a132 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea d2bda36963 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea 844fa2de60 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea cbd352bd7f Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 1 year ago
TDE Gitea c23e82f2fc Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 2 years ago
Slávek Banko 882de94f57
Switch all submodules to https. 2 years ago
TDE Gitea 85384865c6 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 2 years ago
TDE Gitea d0068ad33b Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 2 years ago
TDE Gitea 3723743c79 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 2 years ago
TDE Gitea 5befec0f48 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 2 years ago
TDE Gitea 39537dbb52 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 2 years ago
TDE Gitea af3642fdf5 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 3 years ago
TDE Gitea 911b4e9579 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 3 years ago
TDE Gitea 8ae31bdf2c Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 3 years ago
OBATA Akio 633fbfffae
Prevent to use GNU sed extension feature 3 years ago
TDE Gitea f65e14ec89 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 3 years ago
TDE Gitea 4799565c16 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 3 years ago
TDE Gitea 4c5265b47f Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 3 years ago
TDE Gitea 6bf546dd8d Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 3 years ago
TDE Gitea c93dd48bc5 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 3 years ago
TDE Gitea 9edba481d7 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 3 years ago
TDE Gitea a61efab1d7 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 3 years ago
Slávek Banko 7a1af292fd
cmake: Add BUILD_ALL and WITH_ALL_OPTIONS for consistency with other modules 3 years ago
Slávek Banko 70767b8295 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 3 years ago
Slávek Banko a598649e40 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 3 years ago
Slávek Banko bca3ae005c Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 3 years ago
Slávek Banko dab6f07d97 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 4 years ago
Slávek Banko 40f98895a9 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 5 years ago
Slávek Banko ec048f15ce Fix usage uic-tqt without an '.ui' file in arguments 5 years ago
François Andriot 5595691224 Add missing shebang in bash script 7 years ago
Darrell Anderson 9614d485a1 Fix hard-coded location for pkgconfig file. 8 years ago
Slávek Banko cef06c78ca Do not build tqassistantclient for native tqt build 8 years ago
Slávek Banko e75325e927 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 6 years ago
Slávek Banko 0b9e6cf165 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 6 years ago
Slávek Banko 52c0bc6668 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 8 years ago
Slávek Banko cbe06ea271 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 8 years ago
Slávek Banko 7d83bfee79 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 9 years ago
Slávek Banko 2855ddd209 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 9 years ago
Slávek Banko 91327bcf1d Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 9 years ago
Slávek Banko a1d0685803 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 9 years ago
Slávek Banko cbea5e4189 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 9 years ago
Slávek Banko 88f7fb71a9 Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 9 years ago
Slávek Banko f7c9c25b1c Reset submodule main/dependencies/tqtinterface/cmake to latest HEAD 9 years ago
Slávek Banko 1d3a7c2d00 Reset submodule main/dependencies/tqtinterface/admin to latest HEAD 9 years ago
Slávek Banko acb995ad3d Update final HTML install path so all modules are consistent. 9 years ago
Timothy Pearson 0434eae177 Fix FTBFS in certain packages due to incorrect tqApp mangling 10 years ago
Slávek Banko f9d9c89a92 Add common directories 9 years ago
  1. 3
      .gitmodules
  2. 25
      CMakeLists.txt
  3. 17
      ConfigureChecks.cmake
  4. 4
      README
  5. 1
      admin
  6. 35
      qtinterface/CMakeLists.txt
  7. 2
      qtinterface/convert_qt_tqt1
  8. 5
      qtinterface/tmoc.cmake
  9. 3
      qtinterface/tqt-replace
  10. 7
      qtinterface/tqt-replace-stream
  11. 7
      qtinterface/tqt-replace-stream.cmake
  12. 3
      qtinterface/tqt-replace.cmake
  13. 12
      qtinterface/uic-tqt

3
.gitmodules

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

25
CMakeLists.txt

@ -23,11 +23,12 @@ cmake_minimum_required( VERSION 2.8 )
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 ######################

17
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()

4
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

1
admin

@ -0,0 +1 @@
Subproject commit 5bf424d9d8a3a8c3a894d6540ae164a42d2c25a5

35
qtinterface/CMakeLists.txt

@ -199,10 +199,31 @@ tde_add_library( tqt SHARED
##### 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 )

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

5
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

3
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"

7
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' | \

7
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' | \

3
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"

12
qtinterface/uic-tqt

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