TDE
/
tqtinterface
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tqtinterface
0
0
Fork 0
Code Issues Releases Wiki Activity

qt -> tqt conversion:

Browse Source 
QTDIR -> TQTDIR
QTDOC -> TQTDOC
INCDIR_QT -> INCDIR_TQT
LIBDIR_QT -> LIBDIR_TQT
QT_INC -> TQT_INC
QT_LIB -> TQT_LIB

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 6 years ago
parent 09221e7b45
commit 7b9c011fa0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
19 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File

48
ConfigureChecks.cmake
Unescape View File

@ -48,9 +48,9 @@ endif( )
# qt prefix directory
if( NOT DEFINED QT_PREFIX_DIR )
if( NOT $ENV{QTDIR} STREQUAL "" AND QT_VERSION STREQUAL "3" )
set( QT_PREFIX_DIR "$ENV{QTDIR}" )
qt_message( " QT_PREFIX_DIR is set to QTDIR" )
if( NOT $ENV{TQTDIR} STREQUAL "" AND QT_VERSION STREQUAL "3" )
set( QT_PREFIX_DIR "$ENV{TQTDIR}" )
qt_message( " QT_PREFIX_DIR is set to TQTDIR" )
else( )
set( QT_PREFIX_DIR "/usr" )
endif( )
@ -59,21 +59,21 @@ qt_message( " QT_PREFIX_DIR : ${QT_PREFIX_DIR}" )
# qt headers
if( NOT DEFINED QT_INCLUDE_DIR )
if( NOT DEFINED TQT_INCLUDE_DIR )
if( QT_PREFIX_DIR STREQUAL "/usr" )
if( EXISTS "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" )
set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" )
set( TQT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" )
else( )
set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" )
set( TQT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" )
endif( )
else( )
set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" )
set( TQT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" )
endif( )
endif( )
qt_message( " QT_INCLUDE_DIR: ${QT_INCLUDE_DIR}" )
qt_message( " TQT_INCLUDE_DIR: ${TQT_INCLUDE_DIR}" )
# detect native tqt
if( EXISTS "${QT_INCLUDE_DIR}/ntqglobal.h" )
if( EXISTS "${TQT_INCLUDE_DIR}/ntqglobal.h" )
set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" )
qt_message( "Native TQt3 detected" )
else( )
@ -81,25 +81,25 @@ else( )
endif( )
# qt library path
if( NOT DEFINED QT_LIBRARY_DIR )
set( QT_LIBRARY_DIR "${QT_PREFIX_DIR}/lib${LIB_SUFFIX}" )
if( NOT DEFINED TQT_LIBRARY_DIR )
set( TQT_LIBRARY_DIR "${QT_PREFIX_DIR}/lib${LIB_SUFFIX}" )
if( QT_VERSION STREQUAL "4" )
if( NOT EXISTS "${QT_LIBRARY_DIR}/libQtGui.so" )
if( EXISTS "${QT_LIBRARY_DIR}/qt4/libQtGui.so" )
set( QT_LIBRARY_DIR "${QT_PREFIX_DIR}/lib${LIB_SUFFIX}/qt4" )
if( NOT EXISTS "${TQT_LIBRARY_DIR}/libQtGui.so" )
if( EXISTS "${TQT_LIBRARY_DIR}/qt4/libQtGui.so" )
set( TQT_LIBRARY_DIR "${QT_PREFIX_DIR}/lib${LIB_SUFFIX}/qt4" )
endif( )
endif( )
endif( )
endif( )
qt_message( " QT_LIBRARY_DIR: ${QT_LIBRARY_DIR}" )
qt_message( " TQT_LIBRARY_DIR: ${TQT_LIBRARY_DIR}" )
# qt library name
if( NOT DEFINED QT_LIBRARIES )
if( NOT DEFINED TQT_LIBRARIES )
if( QT_VERSION STREQUAL "3" )
set( QT_LIBRARIES qt-mt )
set( TQT_LIBRARIES qt-mt )
elseif( QT_VERSION STREQUAL "4" )
set( QT_LIBRARIES QtCore QtGui )
set( TQT_LIBRARIES QtCore QtGui )
endif( )
endif( )
@ -179,8 +179,8 @@ endif( )
tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
set( CMAKE_REQUIRED_INCLUDES ${QT_INCLUDE_DIR} )
set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIR} ${QT_LIBRARIES} )
set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIR} )
set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIR} ${TQT_LIBRARIES} )
# check if Qt3 is usable
if( QT_VERSION STREQUAL "3" )
@ -192,8 +192,8 @@ if( QT_VERSION STREQUAL "3" )
# Unset the Qt detection variable
unset( HAVE_USABLE_QT${QT_VERSION} CACHE )
# Reset libraries
set( QT_LIBRARIES tqt-mt )
set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIR} ${QT_LIBRARIES} )
set( TQT_LIBRARIES tqt-mt )
set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIR} ${TQT_LIBRARIES} )
qt_message( "Looking for native TQt3..." )
check_cxx_source_compiles("
#include <ntqapplication.h>
@ -222,8 +222,8 @@ if( QT_VERSION STREQUAL "3" )
# Unset the Qt detection variable
unset( HAVE_PATCHED_QT3 CACHE )
# Reset libraries
set( QT_LIBRARIES tqt-mt )
set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIR} ${QT_LIBRARIES} )
set( TQT_LIBRARIES tqt-mt )
set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIR} ${TQT_LIBRARIES} )
qt_message( "Looking for patched native TQt3..." )
check_cxx_source_compiles("
#include <ntqobjectlist.h>

16
qtinterface/CMakeLists.txt
Unescape View File

@ -21,13 +21,13 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/private
${QT_INCLUDE_DIR}
${TQT_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/${IFACE}
${CMAKE_CURRENT_SOURCE_DIR}/${IFACE}/private
)
link_directories(
${QT_LIBRARY_DIR}
${TQT_LIBRARY_DIR}
)
@ -135,9 +135,9 @@ string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${E
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} )
unset( PC_QT_LIBRARIES )
foreach( _lib ${QT_LIBRARIES} )
set( PC_QT_LIBRARIES "${PC_QT_LIBRARIES} -l${_lib}" )
unset( PC_TQT_LIBRARIES )
foreach( _lib ${TQT_LIBRARIES} )
set( PC_TQT_LIBRARIES "${PC_TQT_LIBRARIES} -l${_lib}" )
endforeach( )
configure_file( tqt.pc.cmake tqt.pc @ONLY )
@ -211,7 +211,7 @@ tde_add_library( tqt SHARED
${IFACE}/tqwidgetlist.cpp ${IFACE}/tqwmatrix.cpp ${IFACE}/tqxml.cpp ${IFACE}/private/tqucomextra_p.cpp
${IFACE}/tqlistiterator.cpp
VERSION 4.2.0
LINK ${QT_LIBRARIES}
LINK ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
@ -231,7 +231,7 @@ if ( NOT HAVE_REAL_TQT )
SOURCES
${IFACE}/tqassistantclient.cpp
VERSION 4.2.0
LINK ${QT_LIBRARIES}
LINK ${TQT_LIBRARIES}
EMBED qassistantclient
DESTINATION ${LIB_INSTALL_DIR}
)
@ -242,7 +242,7 @@ if ( NOT HAVE_REAL_TQT )
SOURCES
${IFACE}/tqassistantclient.cpp
VERSION 4.2.0
LINK ${QT_LIBRARIES} -lqassistantclient
LINK ${TQT_LIBRARIES} -lqassistantclient
DESTINATION ${LIB_INSTALL_DIR}
)

2
qtinterface/qt4/Qt/qapplication.h
Unescape View File

@ -47,7 +47,7 @@
#include <QtCore/qpoint.h>
#include <QtCore/qsize.h>
#include <QtGui/qcursor.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
# include <QtGui/qdesktopwidget.h>
#endif
#ifdef QT3_SUPPORT

2
qtinterface/qt4/Qt/qboxlayout.h
Unescape View File

@ -43,7 +43,7 @@
#define QBOXLAYOUT_H
#include <QtGui/qlayout.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <QtGui/qwidget.h>
#endif

2
qtinterface/qt4/Qt/qcoreapplication.h
Unescape View File

@ -46,7 +46,7 @@
#include <QtCore/qcoreevent.h>
#include <QtCore/qeventloop.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <QtCore/qstringlist.h>
#endif

2
qtinterface/qt4/Qt/qfeatures.h
Unescape View File

@ -42,7 +42,7 @@
/*
* All features and their dependencies.
*
* This list is generated from $QTDIR/src/corelib/global/qfeatures.txt
* This list is generated from $TQTDIR/src/corelib/global/qfeatures.txt
* by $QTSRCDIR/util/scripts/make_qfeatures_dot_h
*/

2
qtinterface/qt4/Qt/qfontmetrics.h
Unescape View File

@ -44,7 +44,7 @@
#include <QtGui/qfont.h>
#include <QtCore/qsharedpointer.h>
#ifndef QT_INCLUDE_COMPAT
#ifndef TQT_INCLUDE_COMPAT
#include <QtCore/qrect.h>
#endif

2
qtinterface/qt4/Qt/qgridlayout.h
Unescape View File

@ -43,7 +43,7 @@
#define QGRIDLAYOUT_H
#include <QtGui/qlayout.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <QtGui/qwidget.h>
#endif

2
qtinterface/qt4/Qt/qobject.h
Unescape View File

@ -48,7 +48,7 @@
#include <QtCore/qstring.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <QtCore/qcoreevent.h>
#endif
#include <QtCore/qscopedpointer.h>

2
qtinterface/qt4/Qt/qpainter.h
Unescape View File

@ -51,7 +51,7 @@
#include <QtGui/qtextoption.h>
#include <QtGui/qdrawutil.h>
#ifndef QT_INCLUDE_COMPAT
#ifndef TQT_INCLUDE_COMPAT
#include <QtGui/qpolygon.h>
#include <QtGui/qpen.h>
#include <QtGui/qbrush.h>

2
qtinterface/qt4/Qt/qstring.h
Unescape View File

@ -46,7 +46,7 @@
#include <QtCore/qbytearray.h>
#include <QtCore/qatomic.h>
#include <QtCore/qnamespace.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <Qt3Support/q3cstring.h>
#endif

2
qtinterface/qt4/Qt/qstringlist.h
Unescape View File

@ -48,7 +48,7 @@
#include <QtCore/qregexp.h>
#include <QtCore/qstring.h>
#include <QtCore/qstringmatcher.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <Qt3Support/q3valuelist.h>
#endif

2
qtinterface/qt4/Qt/qwidget.h
Unescape View File

@ -56,7 +56,7 @@
#include <QtGui/qcursor.h>
#include <QtGui/qkeysequence.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <QtGui/qevent.h>
#endif

4
qtinterface/tqt.pc.cmake
Unescape View File

@ -10,6 +10,6 @@ uic_executable=@UIC_EXECUTABLE@
Name: TQt
Description: Interface and abstraction library for Qt and Trinity
Version: @TQT_VERSION@
Libs: -L${libdir} -ltqt -L@QT_LIBRARY_DIR@ @PC_QT_LIBRARIES@
Cflags: @QT_DEFINITIONS@ -I@QT_INCLUDE_DIR@ -I${includedir} -include tqt.h
Libs: -L${libdir} -ltqt -L@TQT_LIBRARY_DIR@ @PC_TQT_LIBRARIES@
Cflags: @QT_DEFINITIONS@ -I@TQT_INCLUDE_DIR@ -I${includedir} -include tqt.h

2
qtinterface/tqt4/Qt/qapplication.h
Unescape View File

@ -47,7 +47,7 @@
#include <QtCore/qpoint.h>
#include <QtCore/qsize.h>
#include <QtGui/qcursor.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
# include <QtGui/qdesktopwidget.h>
#endif
#ifdef QT3_SUPPORT

2
qtinterface/tqt4/Qt/qobject.h
Unescape View File

@ -48,7 +48,7 @@
#include <QtCore/qstring.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <QtCore/qcoreevent.h>
#endif
#include <QtCore/qscopedpointer.h>

2
qtinterface/tqt4/Qt/qstring.h
Unescape View File

@ -46,7 +46,7 @@
#include <QtCore/qbytearray.h>
#include <QtCore/qatomic.h>
#include <QtCore/qnamespace.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <Qt3Support/q3cstring.h>
#endif

2
qtinterface/tqt4/Qt/qwidget.h
Unescape View File

@ -56,7 +56,7 @@
#include <QtGui/qcursor.h>
#include <QtGui/qkeysequence.h>
#ifdef QT_INCLUDE_COMPAT
#ifdef TQT_INCLUDE_COMPAT
#include <QtGui/qevent.h>
#endif

4
qtinterface/tqtqui.pc.cmake
Unescape View File

@ -6,6 +6,6 @@ includedir=@PC_INCLUDE_DIR@
Name: TQtQUI
Description: Interface and abstraction library for Qt and Trinity (QUI library)
Version: @TQT_VERSION@
Libs: -L${libdir} -ltqt -ltqui -L@QT_LIBRARY_DIR@ @PC_QT_LIBRARIES@
Cflags: @QT_DEFINITIONS@ -I@QT_INCLUDE_DIR@ -I${includedir} -include tqt.h
Libs: -L${libdir} -ltqt -ltqui -L@TQT_LIBRARY_DIR@ @PC_TQT_LIBRARIES@
Cflags: @QT_DEFINITIONS@ -I@TQT_INCLUDE_DIR@ -I${includedir} -include tqt.h

Write Preview
Loading…
Cancel
Save