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

Fix configdialog FTBFS

Browse Source 
(cherry picked from commit 5661d90024)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 70e4630087
commit 47402b5b90
6 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File

3
configdialog/CMakeLists.txt
Unescape View File

@ -15,6 +15,7 @@ include_directories(
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kbfxlib/common ${CMAKE_SOURCE_DIR}/kbfxlib/common
${CMAKE_SOURCE_DIR}/kbfxlib/data ${CMAKE_SOURCE_DIR}/kbfxlib/data
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
@ -28,7 +29,7 @@ link_directories(
##### kbfxconfigapp (executable) ################ ##### kbfxconfigapp (executable) ################
tde_add_executable( kbfxconfigapp tde_add_executable( kbfxconfigapp AUTOMOC
SOURCES main.cpp kbfxconfigapp.cpp kbfxthemeinfo.ui SOURCES main.cpp kbfxconfigapp.cpp kbfxthemeinfo.ui
kbfxconfigdlgbutton.ui kbfxconfigdlgmain.ui kbfxconfigdlgbutton.ui kbfxconfigdlgmain.ui
kbfxconfigdlgthemes.ui kbfxconfigdlgabout.ui kbfxconfigdlgthemes.ui kbfxconfigdlgabout.ui

16
configdialog/kbfxconfigdlgmain.ui
Unescape View File

@ -648,14 +648,14 @@
<include location="local" impldecl="in implementation">kbfxconfigdlgmain.ui.h</include> <include location="local" impldecl="in implementation">kbfxconfigdlgmain.ui.h</include>
</includes> </includes>
<variables> <variables>
<variable access="public">QPixmap img_button;</variable> <variable access="public">TQPixmap img_button;</variable>
<variable access="public">QPixmap img_themes;</variable> <variable access="public">TQPixmap img_themes;</variable>
<variable access="public">QPixmap img_fonts;</variable> <variable access="public">TQPixmap img_fonts;</variable>
<variable access="public">QPixmap img_style;</variable> <variable access="public">TQPixmap img_style;</variable>
<variable access="public">QPixmap img_tooltip;</variable> <variable access="public">TQPixmap img_tooltip;</variable>
<variable access="public">QPixmap img_search;</variable> <variable access="public">TQPixmap img_search;</variable>
<variable access="public">QPixmap img_plugins;</variable> <variable access="public">TQPixmap img_plugins;</variable>
<variable access="public">QPixmap img_about;</variable> <variable access="public">TQPixmap img_about;</variable>
</variables> </variables>
<Q_SIGNALS> <Q_SIGNALS>
<signal>KbfxConfigDlgButtonChanged(const char * name, const QString &amp; path)</signal> <signal>KbfxConfigDlgButtonChanged(const char * name, const QString &amp; path)</signal>

2
configdialog/kbfxconfigdlgthemes.ui
Unescape View File

@ -998,7 +998,7 @@
<variable access="private">bool KbfxFormReady;</variable> <variable access="private">bool KbfxFormReady;</variable>
<variable access="private">TQString KbfxInstallDialogURL;</variable> <variable access="private">TQString KbfxInstallDialogURL;</variable>
<variable access="public">TQStringList KbfxThemes;</variable> <variable access="public">TQStringList KbfxThemes;</variable>
<variable access="public">QPixmap img_nopreview;</variable> <variable access="public">TQPixmap img_nopreview;</variable>
<variable>static KbfxThemeInfo * _info_box;</variable> <variable>static KbfxThemeInfo * _info_box;</variable>
</variables> </variables>
<Q_SIGNALS> <Q_SIGNALS>

2
configdialog/kbfxconfigdlgthemes.ui.h
Unescape View File

@ -315,7 +315,7 @@ void KbfxConfigDlgThemes::KbfxThemeInfoClicked()
TQPixmap _logo = TQPixmap (ConfigInit ().m_SpinxThemeBasePath + ConfigInit ().m_SpinxThemeName + "/logo.png"); TQPixmap _logo = TQPixmap (ConfigInit ().m_SpinxThemeBasePath + ConfigInit ().m_SpinxThemeName + "/logo.png");
ConfigInit().readThemeInfo ( ConfigInit().m_SpinxThemeBasePath, ConfigInit().m_SpinxThemeName ); ConfigInit().readThemeInfo ( ConfigInit().m_SpinxThemeBasePath, ConfigInit().m_SpinxThemeName );
_info_box = new KbfxThemeInfo (this,"infodlg",TQt::WType_Modal); _info_box = new KbfxThemeInfo (this,"infodlg",(WType_Dialog|WShowModal));
if ( !_logo.isNull() ) if ( !_logo.isNull() )
{ {

4
configdialog/kbfxconfigdlgtooltip.ui
Unescape View File

@ -694,8 +694,8 @@
<include location="local" impldecl="in implementation">kbfxconfigdlgtooltip.ui.h</include> <include location="local" impldecl="in implementation">kbfxconfigdlgtooltip.ui.h</include>
</includes> </includes>
<variables> <variables>
<variable access="public">QPixmap img_on;</variable> <variable access="public">TQPixmap img_on;</variable>
<variable access="public">QPixmap img_off;</variable> <variable access="public">TQPixmap img_off;</variable>
</variables> </variables>
<Q_SLOTS> <Q_SLOTS>
<slot>KbfxTooltipAnimationButtonToggled( bool )</slot> <slot>KbfxTooltipAnimationButtonToggled( bool )</slot>

86
plugins/applications/CMakeLists.txt
Unescape View File

@ -1,44 +1,44 @@
SET(libkbfxplasmadatastubsrc #################################################
kbfxplasmadataplugin.cpp #
) # (C) 2011 Timothy Pearson
# kb9vqf (AT) pearsoncomputing.net
FILE(GLOB HEADERS *.h) #
# Improvements and feedback are welcome
IF (NOT USE_KDE4) #
KDE3_AUTOMOC(${libkbfxplasmadatastubsrc}) # This file is released under GPL >= 2
#
ADD_LIBRARY(kbfxplasmadatastub SHARED ${libkbfxplasmadatastubsrc}) #################################################
SET_TARGET_PROPERTIES(kbfxplasmadatastub
PROPERTIES include_directories(
COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) ${TQT_INCLUDE_DIRS}
# SET_TARGET_PROPERTIES(kbfxplasmadatastub PROPERTIES ${TDE_INCLUDE_DIR}
# SOVERSION ${LIB_MAJOR} ${CMAKE_BINARY_DIR}
# VERSION ${APPLICATION_VERSION}) ${CMAKE_CURRENT_BINARY_DIR}
TARGET_LINK_LIBRARIES(kbfxplasmadatastub ${CMAKE_CURRENT_SOURCE_DIR}
kbfxdata )
${QT_AND_KDECORE_LIBS}
${KDE3_KIO_LIBRARY} link_directories(
${KDE3_UI_LIBRARY} ${TQT_LIBRARY_DIRS}
${KDE3_KHTML_LIBRARY} )
${M_LIBRARY}
)
##### kbfxplasmadatastub #########################
KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatastub ${LIB_INSTALL_DIR}/kbfx/plugins)
ELSE (NOT USE_KDE4) set( target kbfxplasmadatastub )
KDE4_AUTOMOC(${libkbfxplasmadatastubsrc})
set( ${target}_SRCS
KDE4_ADD_LIBRARY(kbfxplasmadatastub SHARED ${libkbfxplasmadatastubsrc}) kbfxplasmadataplugin.cpp
TARGET_LINK_LIBRARIES(kbfxplasmadatastub )
kbfxdata
${KDE4_KDECORE_LIBS} tde_add_library( ${target} SHARED AUTOMOC
${KDE4_KIO_LIBS} SOURCES ${${target}_SRCS}
${KDE4_KDEUI_LIBS} # VERSION 4.2.0
${KDE4_KHTML_LIBS} LINK DCOP-shared kdecore-shared kdeui-shared kio-shared khtml-shared ${M_LIBRARY} kbfxdata
${M_LIBRARY} DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
) )
KDE4_INSTALL_LIBTOOL_FILE(kbfxplasmadatastub ${LIB_INSTALL_DIR}/kbfx/plugins)
ENDIF (NOT USE_KDE4) ##### headers #######################################
INSTALL(TARGETS kbfxplasmadatastub DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins) file( GLOB HEADERS *.h )
INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins) INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)

Write Preview
Loading…
Cancel
Save