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

Fix FTBFS

Browse Source
pull/21/head
Timothy Pearson 13 years ago
parent 26af4d3ef6
commit 4635130750
8 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape View File

@ -90,7 +90,7 @@ option( BUILD_KTNEF "Build ktnef" ${BUILD_ALL} )
option( BUILD_LIBKCAL "Build libkcal" ${BUILD_ALL} ) option( BUILD_LIBKCAL "Build libkcal" ${BUILD_ALL} )
option( BUILD_LIBTDEPIM "Build libtdepim" ${BUILD_ALL} ) option( BUILD_LIBTDEPIM "Build libtdepim" ${BUILD_ALL} )
option( BUILD_LIBKPIMIDENTITIES "Build libkpimidentities" ${BUILD_ALL} ) option( BUILD_LIBKPIMIDENTITIES "Build libkpimidentities" ${BUILD_ALL} )
option( BUILD_LIBKDENETWORK "Build libtdenetwork" ${BUILD_ALL} ) option( BUILD_LIBTDENETWORK "Build libtdenetwork" ${BUILD_ALL} )
option( BUILD_CERTMANAGER "Build certmanager" ${BUILD_ALL} ) option( BUILD_CERTMANAGER "Build certmanager" ${BUILD_ALL} )
option( BUILD_LIBKPGP "Build libkpgp" ${BUILD_ALL} ) option( BUILD_LIBKPGP "Build libkpgp" ${BUILD_ALL} )
option( BUILD_MIMELIB "Build mimelib" ${BUILD_ALL} ) option( BUILD_MIMELIB "Build mimelib" ${BUILD_ALL} )
@ -161,7 +161,7 @@ tde_conditional_add_subdirectory( BUILD_LIBKCAL libkcal )
tde_conditional_add_subdirectory( BUILD_LIBTDEPIM pixmaps ) tde_conditional_add_subdirectory( BUILD_LIBTDEPIM pixmaps )
tde_conditional_add_subdirectory( BUILD_LIBTDEPIM libtdepim ) tde_conditional_add_subdirectory( BUILD_LIBTDEPIM libtdepim )
tde_conditional_add_subdirectory( BUILD_LIBKPIMIDENTITIES libkpimidentities ) tde_conditional_add_subdirectory( BUILD_LIBKPIMIDENTITIES libkpimidentities )
tde_conditional_add_subdirectory( BUILD_LIBKDENETWORK libtdenetwork ) tde_conditional_add_subdirectory( BUILD_LIBTDENETWORK libtdenetwork )
tde_conditional_add_subdirectory( BUILD_CERTMANAGER certmanager ) tde_conditional_add_subdirectory( BUILD_CERTMANAGER certmanager )
tde_conditional_add_subdirectory( BUILD_LIBKPGP libkpgp ) tde_conditional_add_subdirectory( BUILD_LIBKPGP libkpgp )
tde_conditional_add_subdirectory( BUILD_MIMELIB mimelib ) tde_conditional_add_subdirectory( BUILD_MIMELIB mimelib )

2
ConfigureChecks.cmake
Unescape View File

@ -57,7 +57,7 @@ if( WITH_GNOKII AND (BUILD_KADDRESSBOOK OR BUILD_KMOBILE) )
endif( ) endif( )
if( BUILD_LIBKDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT ) if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT )
if( NOT HAVE_GPGME_0_4_BRANCH ) if( NOT HAVE_GPGME_0_4_BRANCH )
message( STATUS "checking for 'gpgme'" ) message( STATUS "checking for 'gpgme'" )

2
kmail/kmail.kcfg
Unescape View File

@ -547,7 +547,7 @@
<group name="Geometry"> <group name="Geometry">
<entry name="ComposerSize" type="Size" key="composer"> <entry name="ComposerSize" type="Size" key="composer">
<default>QSize(480,510)</default> <default>TQSize(480,510)</default>
</entry> </entry>
</group> </group>

6
kmail/kmkernel.cpp
Unescape View File

@ -1941,12 +1941,12 @@ void KMKernel::kmailMsgHandler(TQtMsgType aType, const char* aMsg)
switch (aType) switch (aType)
{ {
case QtDebugMsg: case TQtDebugMsg:
case QtWarningMsg: case TQtWarningMsg:
kdDebug(5006) << aMsg << endl; kdDebug(5006) << aMsg << endl;
break; break;
case QtFatalMsg: // Hm, what about using kdFatal() here? case TQtFatalMsg: // Hm, what about using kdFatal() here?
ungrabPtrKb(); ungrabPtrKb();
kdDebug(5006) << kapp->caption() << " fatal error " kdDebug(5006) << kapp->caption() << " fatal error "
<< aMsg << endl; << aMsg << endl;

2
knotes/knoteconfig.kcfg
Unescape View File

@ -66,7 +66,7 @@
</entry> </entry>
<entry name="Position" type="Point" key="position"> <entry name="Position" type="Point" key="position">
<default code="true">QPoint( -10000, -10000 )</default> <default code="true">TQPoint( -10000, -10000 )</default>
</entry> </entry>
<entry name="ShowInTaskbar" type="Bool"> <entry name="ShowInTaskbar" type="Bool">

10
korganizer/korganizer.kcfg
Unescape View File

@ -141,12 +141,12 @@
<entry type="DateTime" name="StartTime"> <entry type="DateTime" name="StartTime">
<label>Default appointment time</label> <label>Default appointment time</label>
<whatsthis>Enter the default time for events here. The default is used if you do not supply a start time.</whatsthis> <whatsthis>Enter the default time for events here. The default is used if you do not supply a start time.</whatsthis>
<default>QDateTime(QDate(), QTime(10,0))</default> <default>TQDateTime(TQDate(), TQTime(10,0))</default>
</entry> </entry>
<entry type="DateTime" name="DefaultDuration"> <entry type="DateTime" name="DefaultDuration">
<label>Default duration of new appointment (HH:MM)</label> <label>Default duration of new appointment (HH:MM)</label>
<whatsthis>Enter default duration for events here. The default is used if you do not supply an end time.</whatsthis> <whatsthis>Enter default duration for events here. The default is used if you do not supply an end time.</whatsthis>
<default>QDateTime(QDate(), QTime(2,0))</default> <default>TQDateTime(TQDate(), TQTime(2,0))</default>
</entry> </entry>
<entry type="Int" key="Default Reminder Time" name="ReminderTime"> <entry type="Int" key="Default Reminder Time" name="ReminderTime">
@ -277,18 +277,18 @@
<entry type="DateTime" name="DayBegins"> <entry type="DateTime" name="DayBegins">
<label>Day begins at</label> <label>Day begins at</label>
<whatsthis>Enter the start time for events here. This time should be the earliest time that you use for events, as it will be displayed at the top.</whatsthis> <whatsthis>Enter the start time for events here. This time should be the earliest time that you use for events, as it will be displayed at the top.</whatsthis>
<default>QDateTime(QDate(), QTime(7,0))</default> <default>TQDateTime(TQDate(), TQTime(7,0))</default>
</entry> </entry>
<entry type="DateTime" name="WorkingHoursStart"> <entry type="DateTime" name="WorkingHoursStart">
<label>Daily starting hour</label> <label>Daily starting hour</label>
<whatsthis>Enter the start time for the working hours here. The working hours will be marked with color by KOrganizer.</whatsthis> <whatsthis>Enter the start time for the working hours here. The working hours will be marked with color by KOrganizer.</whatsthis>
<default>QDateTime(QDate(), QTime(8,0))</default> <default>TQDateTime(TQDate(), TQTime(8,0))</default>
</entry> </entry>
<entry type="DateTime" name="WorkingHoursEnd"> <entry type="DateTime" name="WorkingHoursEnd">
<label>Daily ending hour</label> <label>Daily ending hour</label>
<whatsthis>Enter the ending time for the working hours here. The working hours will be marked with color by KOrganizer.</whatsthis> <whatsthis>Enter the ending time for the working hours here. The working hours will be marked with color by KOrganizer.</whatsthis>
<default>QDateTime(QDate(), QTime(17,0))</default> <default>TQDateTime(TQDate(), TQTime(17,0))</default>
</entry> </entry>
<entry type="Int" key="Work Week Mask" name="WorkWeekMask"> <entry type="Int" key="Work Week Mask" name="WorkWeekMask">
<default>31</default> <default>31</default>

2
libtdepim/CMakeLists.txt
Unescape View File

@ -98,7 +98,7 @@ tde_add_library( tdepim SHARED AUTOMOC
csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp
sendsmsdialog.cpp kmailcompletion.cpp sendsmsdialog.cpp kmailcompletion.cpp
VERSION 1.0.0 VERSION 1.0.0
LINK kcal-shared kimproxy-shared kparts-shared qui LINK kcal-shared kimproxy-shared kparts-shared ${TQUI_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

10
libtdepim/ConfigureChecks.cmake
Unescape View File

@ -8,3 +8,13 @@
# This file is released under GPL >= 2 # This file is released under GPL >= 2
# #
################################################# #################################################
foreach( f ${TQT_LIBRARIES} )
if( ${f} STREQUAL "tqt-mt" )
set(TQUI_LIBRARIES "tqui" CACHE TYPE STRING FORCE)
endif()
if( ${f} STREQUAL "qt-mt" )
set(TQUI_LIBRARIES "qui" CACHE TYPE STRING FORCE)
endif()
endforeach()

Write Preview
Loading…
Cancel
Save