From: Alexander Rieder Date: Sun, 29 Aug 2010 23:33:55 +0000 (+0000) Subject: move QtMmlWidget to libkdeedu to make it possible to reuse it in Cantor. X-Git-Tag: v4.5.80~9 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=3860d6ca0bb20655c25cbaf23a09dc2ee5ef307f;p=libqmvoc.git move QtMmlWidget to libkdeedu to make it possible to reuse it in Cantor. CCMAIL: kde-edu@kde.org svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=1169724 --- 3860d6ca0bb20655c25cbaf23a09dc2ee5ef307f diff --cc CMakeLists.txt index 1d296a7,0000000..40dbcb5 mode 100644,000000..100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -1,8 -1,0 +1,9 @@@ +project(libkdeedu) + +#add_definitions( -Wall -fprofile-arcs -ftest-coverage ) + +add_subdirectory(keduvocdocument) +add_subdirectory(kdeeduui) +add_subdirectory(libscience) +#add_subdirectory(widgets) ++add_subdirectory(qtmmlwidget) diff --cc keduvocdocument/CMakeLists.txt index df3a8f3,0000000..df9c5d7 mode 100644,000000..100644 --- a/keduvocdocument/CMakeLists.txt +++ b/keduvocdocument/CMakeLists.txt @@@ -1,73 -1,0 +1,72 @@@ +add_subdirectory(tests) + +########### next target ############### + +set(keduvocdocument_LIB_SRCS + keduvocdocument.cpp + keduvocidentifier.cpp + keduvocexpression.cpp + keduvoctranslation.cpp + keduvoccontainer.cpp + keduvoclesson.cpp + keduvocleitnerbox.cpp + keduvoctext.cpp + keduvocarticle.cpp + keduvocconjugation.cpp + keduvocpersonalpronoun.cpp + keduvocdeclension.cpp + keduvocwordtype.cpp + keduvockvtmlcompability.cpp + keduvockvtmlreader.cpp + keduvockvtml2reader.cpp + keduvockvtml2writer.cpp + keduvoccsvreader.cpp + keduvoccsvwriter.cpp + keduvocpaukerreader.cpp + keduvocvokabelnreader.cpp + keduvocwqlreader.cpp + keduvocxdxfreader.cpp + sharedkvtmlfiles.cpp +) + +kde4_add_library(keduvocdocument SHARED ${keduvocdocument_LIB_SRCS}) + +target_link_libraries(keduvocdocument ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY}) + +set_target_properties(keduvocdocument + PROPERTIES VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) + +# if we want to set our own version instead of following kde generic +#set(LIB_KEDUVOCDOCUMENT_VERSION "5.0.0") +#set(LIB_KEDUVOCDOCUMENT_SOVERSION "5") +#set_target_properties(keduvocdocument +# PROPERTIES VERSION ${LIB_KEDUVOCDOCUMENT_VERSION} +# SOVERSION ${LIB_KEDUVOCDOCUMENT_SOVERSION} +#) + +install(TARGETS keduvocdocument ${INSTALL_TARGETS_DEFAULT_ARGS}) + + +########### install files ############### + +install(FILES + libkeduvocdocument_export.h + keduvocdocument.h + keduvocidentifier.h + keduvocexpression.h + keduvoctext.h + keduvocarticle.h + keduvocconjugation.h + keduvoclesson.h + keduvocleitnerbox.h + keduvoccontainer.h + keduvocwordflags.h + keduvocmultiplechoice.h + keduvoctranslation.h + keduvocwordtype.h + keduvocpersonalpronoun.h + sharedkvtmlfiles.h + DESTINATION ${INCLUDE_INSTALL_DIR}/libkdeedu COMPONENT Devel +) - diff --cc qtmmlwidget/QtMmlDocument index 0000000,ef69b7f..ef69b7f mode 000000,100644..100644 --- a/qtmmlwidget/QtMmlDocument +++ b/qtmmlwidget/QtMmlDocument diff --cc qtmmlwidget/QtMmlWidget index 0000000,ef69b7f..ef69b7f mode 000000,100644..100644 --- a/qtmmlwidget/QtMmlWidget +++ b/qtmmlwidget/QtMmlWidget diff --cc qtmmlwidget/qtmmlwidget.cpp index 0000000,f971370..f971370 mode 000000,100644..100644 --- a/qtmmlwidget/qtmmlwidget.cpp +++ b/qtmmlwidget/qtmmlwidget.cpp diff --cc qtmmlwidget/qtmmlwidget.h index 0000000,2c9b1c6..2c9b1c6 mode 000000,100644..100644 --- a/qtmmlwidget/qtmmlwidget.h +++ b/qtmmlwidget/qtmmlwidget.h