TDE
/
kpilot
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kpilot
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 54af1c400f
commit 961fec6d30
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

8
CMakeLists.txt
Unescape View File

@ -32,10 +32,10 @@ endif(insource)
find_package(Qt3) # find and setup Qt3 for this project find_package(Qt3) # find and setup Qt3 for this project
if (NOT QT_INCLUDE_DIR) if (NOT TQT_INCLUDE_DIR)
MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4") MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4")
SET(QT_INCLUDE_DIR "/usr/include/qt4" CACHE PATH "" FORCE) SET(TQT_INCLUDE_DIR "/usr/include/qt4" CACHE PATH "" FORCE)
endif (NOT QT_INCLUDE_DIR) endif (NOT TQT_INCLUDE_DIR)
SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt") SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt")
SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc") SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc")
@ -74,7 +74,7 @@ set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/trinity)
link_directories(${KDE3_LIB_DIR}) link_directories(${KDE3_LIB_DIR})
# tell cmake where to search for Qt/KDE headers: # tell cmake where to search for Qt/KDE headers:
include_directories(${PILOTLINK_INCLUDE_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}) include_directories(${PILOTLINK_INCLUDE_DIR} ${KDE3_INCLUDE_DIR} ${TQT_INCLUDE_DIR})
# include custom macros # include custom macros
INCLUDE(${CMAKE_SOURCE_DIR}/cmake/modules/KPilotCustom.cmake) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/modules/KPilotCustom.cmake)

2
ChangeLog
Unescape View File

@ -3942,7 +3942,7 @@ CVS stuff with KPilot in it and then complain when your Pilot
catches fire, OK? O yeah .. when you *do* give it a try, make catches fire, OK? O yeah .. when you *do* give it a try, make
sure you do something like: sure you do something like:
$ export LD_LIBRARY_PATH=$QTDIR/lib: $ export LD_LIBRARY_PATH=$TQTDIR/lib:
$ kpilot --debug 1023 $ kpilot --debug 1023
To make sure none of the conduits crashes with library loading To make sure none of the conduits crashes with library loading

6
Documentation/README-3.2.1+
Unescape View File

@ -79,14 +79,14 @@ should do the trick. If this fails as well, you can subscribe to the
KPilot mailing list and state the nature of the failure there. KPilot mailing list and state the nature of the failure there.
*NOTE* that KPilot makes assumptions about where pilot-link and *NOTE* that KPilot makes assumptions about where pilot-link and
the Qt libraries are; in particular it is important to set QTDIR correctly the Qt libraries are; in particular it is important to set TQTDIR correctly
(to the Qt 1.44 directories) when compiling KPilot. On many systems the (to the Qt 1.44 directories) when compiling KPilot. On many systems the
command to do this will be command to do this will be
export QTDIR=/usr/lib/qt-2* export TQTDIR=/usr/lib/qt-2*
but your mileage may vary. RedHat 6.2 systems ship with Qt 1.45 and Qt 2.1, but your mileage may vary. RedHat 6.2 systems ship with Qt 1.45 and Qt 2.1,
in which case it is doubly important to set QTDIR properly. in which case it is doubly important to set TQTDIR properly.
USING THE SOFTWARE USING THE SOFTWARE
================== ==================

2
conduits/docconduit/CMakeLists.txt
Unescape View File

@ -58,7 +58,7 @@ kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc)
trinity_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui) trinity_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui)
trinity_automoc(${kpalmdoc_SRCS}) trinity_automoc(${kpalmdoc_SRCS})
add_executable(kpalmdoc ${kpalmdoc_SRCS}) add_executable(kpalmdoc ${kpalmdoc_SRCS})
target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot tdeui tdeio) target_link_libraries(kpalmdoc ${TQT_LIBRARIES} kpilot tdeui tdeio)
kpilot_rpath(kpalmdoc) kpilot_rpath(kpalmdoc)
install( install(

6
kpilot/CMakeLists.txt
Unescape View File

@ -79,7 +79,7 @@ kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h)
trinity_automoc(${kpilotTest_SRCS}) trinity_automoc(${kpilotTest_SRCS})
add_executable(kpilotTest ${kpilotTest_SRCS}) add_executable(kpilotTest ${kpilotTest_SRCS})
target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot tdeui tdeio) target_link_libraries(kpilotTest ${TQT_LIBRARIES} kpilot tdeui tdeio)
kpilot_rpath(kpilotTest) kpilot_rpath(kpilotTest)
### ###
@ -99,7 +99,7 @@ kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h)
kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h) kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h)
trinity_automoc(${kpilotDaemon_SRCS}) trinity_automoc(${kpilotDaemon_SRCS})
add_executable(kpilotDaemon ${kpilotDaemon_SRCS}) add_executable(kpilotDaemon ${kpilotDaemon_SRCS})
target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot tdeui tdeio) target_link_libraries(kpilotDaemon ${TQT_LIBRARIES} kpilot tdeui tdeio)
kpilot_rpath(kpilotDaemon) kpilot_rpath(kpilotDaemon)
### ###
@ -137,7 +137,7 @@ kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h) kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h)
trinity_automoc(${kpilot_SRCS}) trinity_automoc(${kpilot_SRCS})
add_executable(kpilot_bin ${kpilot_SRCS}) add_executable(kpilot_bin ${kpilot_SRCS})
target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot tdeutils tdeui tdeio) target_link_libraries(kpilot_bin ${TQT_LIBRARIES} kpilot tdeutils tdeui tdeio)
kpilot_rpath(kpilot_bin) kpilot_rpath(kpilot_bin)
set_target_properties(kpilot_bin PROPERTIES set_target_properties(kpilot_bin PROPERTIES
OUTPUT_NAME kpilot OUTPUT_NAME kpilot

12
kpilot/Makefile-standalone
Unescape View File

@ -1,21 +1,21 @@
# Makefile for a standalone kpilotConfig # Makefile for a standalone kpilotConfig
QTDIR=/usr/lib/qt-2.3.0 TQTDIR=/usr/lib/qt-2.3.0
TDEDIR=/vol/kde/kde-2.2 TDEDIR=/vol/kde/kde-2.2
MOC=$(QTDIR)/bin/moc MOC=$(TQTDIR)/bin/moc
UIC=$(QTDIR)/bin/uic UIC=$(TQTDIR)/bin/uic
DCOPIDL=$(TDEDIR)/bin/dcopidl DCOPIDL=$(TDEDIR)/bin/dcopidl
DCOPIDL2CPP=$(TDEDIR)/bin/dcopidl2cpp DCOPIDL2CPP=$(TDEDIR)/bin/dcopidl2cpp
CXX=g++ CXX=g++
CXXFLAGS=-DDEBUG -DDEBUG_CERR CXXFLAGS=-DDEBUG -DDEBUG_CERR
# INCLUDES=-I$(QTDIR)/include -I$(TDEDIR)/include # INCLUDES=-I$(TQTDIR)/include -I$(TDEDIR)/include
# #
# Or, for stupid RH 7.1 systems: # Or, for stupid RH 7.1 systems:
INCLUDES=-I$(QTDIR)/include -I$(TDEDIR)/include -I../lib INCLUDES=-I$(TQTDIR)/include -I$(TDEDIR)/include -I../lib
LDFLAGS=-L$(TDEDIR)/lib -Wl,-R -Wl,$(TDEDIR)/lib \ LDFLAGS=-L$(TDEDIR)/lib -Wl,-R -Wl,$(TDEDIR)/lib \
-L$(QTDIR)/lib -Wl,-R -Wl,$(QTDIR)/lib \ -L$(TQTDIR)/lib -Wl,-R -Wl,$(TQTDIR)/lib \
-L../lib/.libs -L../lib/.libs
CONFIG_DISTDIR=kpilotConfig-0.2 CONFIG_DISTDIR=kpilotConfig-0.2

2
lib/CMakeLists.txt
Unescape View File

@ -55,7 +55,7 @@ set(lib_SRCS
trinity_automoc(${lib_SRCS}) trinity_automoc(${lib_SRCS})
kde3_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc) kde3_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc)
add_library(kpilot SHARED ${lib_SRCS}) add_library(kpilot SHARED ${lib_SRCS})
target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} tdeui tdeio) target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${TQT_LIBRARIES} tdeui tdeio)
kpilot_rpath(kpilot) kpilot_rpath(kpilot)
#---------- INSTALL -----------------------* #---------- INSTALL -----------------------*

18
tests/CMakeLists.txt
Unescape View File

@ -6,27 +6,27 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(testconstants_SRCS testconstants.cc) set(testconstants_SRCS testconstants.cc)
trinity_add_executable(testconstants ${testconstants_SRCS}) trinity_add_executable(testconstants ${testconstants_SRCS})
target_link_libraries(testconstants kpilot ${QT_LIBRARIES}) target_link_libraries(testconstants kpilot ${TQT_LIBRARIES})
add_test(testconstants ${EXECUTABLE_OUTPUT_PATH}/testconstants) add_test(testconstants ${EXECUTABLE_OUTPUT_PATH}/testconstants)
set(testcategories_SRCS testcategories.cc) set(testcategories_SRCS testcategories.cc)
trinity_add_executable(testcategories ${testcategories_SRCS}) trinity_add_executable(testcategories ${testcategories_SRCS})
target_link_libraries(testcategories kpilot ${QT_LIBRARIES}) target_link_libraries(testcategories kpilot ${TQT_LIBRARIES})
add_test(testcategories ${EXECUTABLE_OUTPUT_PATH}/testcategories) add_test(testcategories ${EXECUTABLE_OUTPUT_PATH}/testcategories)
set(testaddresses_SRCS testaddress.cc) set(testaddresses_SRCS testaddress.cc)
trinity_add_executable(testaddresses ${testaddresses_SRCS}) trinity_add_executable(testaddresses ${testaddresses_SRCS})
target_link_libraries(testaddresses kpilot ${QT_LIBRARIES}) target_link_libraries(testaddresses kpilot ${TQT_LIBRARIES})
add_test(testaddresses ${EXECUTABLE_OUTPUT_PATH}/testaddresses) add_test(testaddresses ${EXECUTABLE_OUTPUT_PATH}/testaddresses)
set(testdatebook_SRCS testdatebook.cc) set(testdatebook_SRCS testdatebook.cc)
trinity_add_executable(testdatebook ${testdatebook_SRCS}) trinity_add_executable(testdatebook ${testdatebook_SRCS})
target_link_libraries(testdatebook kpilot ${QT_LIBRARIES}) target_link_libraries(testdatebook kpilot ${TQT_LIBRARIES})
add_test(testdatebook ${EXECUTABLE_OUTPUT_PATH}/testdatebook) add_test(testdatebook ${EXECUTABLE_OUTPUT_PATH}/testdatebook)
set(testidmapper_SRCS testidmapper.cc) set(testidmapper_SRCS testidmapper.cc)
trinity_add_executable(testidmapper ${testidmapper_SRCS}) trinity_add_executable(testidmapper ${testidmapper_SRCS})
target_link_libraries(testidmapper kpilot ${QT_LIBRARIES}) target_link_libraries(testidmapper kpilot ${TQT_LIBRARIES})
add_test(testidmapper ${EXECUTABLE_OUTPUT_PATH}/testidmapper) add_test(testidmapper ${EXECUTABLE_OUTPUT_PATH}/testidmapper)
if (HAVE_CALENDARLOCAL_H) if (HAVE_CALENDARLOCAL_H)
@ -36,9 +36,9 @@ if (HAVE_CALENDARLOCAL_H)
trinity_add_executable(importdatebook ${importdatebook_SRCS}) trinity_add_executable(importdatebook ${importdatebook_SRCS})
trinity_add_executable(exportdatebook ${exportdatebook_SRCS}) trinity_add_executable(exportdatebook ${exportdatebook_SRCS})
trinity_add_executable(mergecalendars ${mergecalendars_SRCS}) trinity_add_executable(mergecalendars ${mergecalendars_SRCS})
target_link_libraries(importdatebook kpilot ${QT_LIBRARIES} kcal) target_link_libraries(importdatebook kpilot ${TQT_LIBRARIES} kcal)
target_link_libraries(exportdatebook kpilot ${QT_LIBRARIES} kcal) target_link_libraries(exportdatebook kpilot ${TQT_LIBRARIES} kcal)
target_link_libraries(mergecalendars ${QT_LIBRARIES} kcal) target_link_libraries(mergecalendars ${TQT_LIBRARIES} kcal)
add_test(importdatebook ${EXECUTABLE_OUTPUT_PATH}/importdatebook) add_test(importdatebook ${EXECUTABLE_OUTPUT_PATH}/importdatebook)
add_test(exportdatebook ${EXECUTABLE_OUTPUT_PATH}/exportdatebook) add_test(exportdatebook ${EXECUTABLE_OUTPUT_PATH}/exportdatebook)
add_test(mergecalendars ${EXECUTABLE_OUTPUT_PATH}/mergecalendars) add_test(mergecalendars ${EXECUTABLE_OUTPUT_PATH}/mergecalendars)
@ -46,6 +46,6 @@ endif (HAVE_CALENDARLOCAL_H)
set(importaddresses_SRCS importaddresses.cc) set(importaddresses_SRCS importaddresses.cc)
trinity_add_executable(importaddresses ${importaddresses_SRCS}) trinity_add_executable(importaddresses ${importaddresses_SRCS})
target_link_libraries(importaddresses kpilot ${QT_LIBRARIES} tdeabc tdeabc_file) target_link_libraries(importaddresses kpilot ${TQT_LIBRARIES} tdeabc tdeabc_file)
add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses) add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses)

Write Preview
Loading…
Cancel
Save