Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kcalc: stop using kdeinit for main application

Browse source
This commit is contained in:
Ivailo Monev 2015-06-22 19:29:04 +03:00
parent b8e7d5181e
commit 9fbbb0a9eb
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
kcalc/CMakeLists.txt
View file

@ -53,7 +53,7 @@ set(libknumber_la_SRCS
add_subdirectory( knumber )
# add_subdirectory( tests )
set(kcalc_KDEINIT_SRCS ${libknumber_la_SRCS}
set(kcalc_SRCS ${libknumber_la_SRCS}
kcalc.cpp
bitbutton.cpp
kcalc_bitset.cpp
@ -64,24 +64,21 @@ set(kcalc_KDEINIT_SRCS ${libknumber_la_SRCS}
kcalcdisplay.cpp
stats.cpp )
kde4_add_ui_files(kcalc_KDEINIT_SRCS
kde4_add_ui_files(kcalc_SRCS
kcalc.ui
constants.ui
colors.ui
fonts.ui
general.ui)
kde4_add_kcfg_files(kcalc_KDEINIT_SRCS kcalc_settings.kcfgc )
kde4_add_kcfg_files(kcalc_SRCS kcalc_settings.kcfgc )
kde4_add_app_icon(kcalc_KDEINIT_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/accessories-calculator.png")
kde4_add_app_icon(kcalc_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/accessories-calculator.png")
kde4_add_kdeinit_executable( kcalc ${kcalc_KDEINIT_SRCS})
kde4_add_executable( kcalc ${kcalc_SRCS})
target_link_libraries(kdeinit_kcalc ${QT_QTXML_LIBRARY} ${KDE4_KDEUI_LIBS} ${GMP_LIBRARIES} ${MPFR_LIBRARIES})
target_link_libraries(kcalc ${QT_QTXML_LIBRARY} ${KDE4_KDEUI_LIBS} ${GMP_LIBRARIES} ${MPFR_LIBRARIES})
install(TARGETS kdeinit_kcalc ${INSTALL_TARGETS_DEFAULT_ARGS})
target_link_libraries( kcalc kdeinit_kcalc )
install(TARGETS kcalc ${INSTALL_TARGETS_DEFAULT_ARGS} )
########### install files ###############

2
kcalc/kcalc.cpp
View file

@ -2279,7 +2279,7 @@ bool KCalculator::eventFilter(QObject *o, QEvent *e) {
// Name: kdemain
// Desc: entry point of the application
//------------------------------------------------------------------------------
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
KAboutData aboutData("kcalc",
0,