[kde-edu]: KDE/kdeedu

[Alexander Rieder]

SVN commit 1169724 by arieder:

move QtMmlWidget to libkdeedu to make it possible to reuse it in Cantor.
CCMAIL: kde-edu at kde.org


 M  +2 -4      kalgebra/src/CMakeLists.txt  
 M  +1 -1      kalgebra/src/dictionary.cpp  
 D             kalgebra/src/qtmmlwidget (directory)  
 M  +1 -0      libkdeedu/CMakeLists.txt  
 M  +0 -1      libkdeedu/keduvocdocument/CMakeLists.txt  
 A             libkdeedu/qtmmlwidget (directory)  


--- trunk/KDE/kdeedu/kalgebra/src/CMakeLists.txt #1169723:1169724
@@ -1,4 +1,4 @@
-include_directories(../analitza .. ${OPENGL_INCLUDE_DIR})
+include_directories(../analitza .. ${OPENGL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/libkdeedu/qtmmlwidget/ )
 
 set(kalgebra_SRCS
 	kalgebra.cpp
@@ -15,8 +15,6 @@
 	viewportwidget.cpp
 	functionsview.cpp
 	functionsmodel.cpp
-
-	qtmmlwidget/qtmmlwidget.cpp
 )
 
 if(OPENGL_FOUND)
@@ -31,7 +29,7 @@
 kde4_add_app_icon(kalgebra_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-kalgebra.png")
 
 kde4_add_executable(kalgebra ${kalgebra_SRCS})
-target_link_libraries(kalgebra ${KDE4_KHTML_LIBS} analitza analitzagui)
+target_link_libraries(kalgebra ${KDE4_KHTML_LIBS} analitza analitzagui qtmmlwidget)
 
 if(OPENGL_FOUND)
    target_link_libraries(kalgebra ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
--- trunk/KDE/kdeedu/kalgebra/src/dictionary.cpp #1169723:1169724
@@ -32,7 +32,7 @@
 #include <QFormLayout>
 #include <KLineEdit>
 #include <KLocale>
-#include <qtmmlwidget/qtmmlwidget.h>
+#include <QtMmlWidget>
 
 Dictionary::Dictionary(QWidget *p) : QWidget(p)
 {
--- trunk/KDE/kdeedu/libkdeedu/CMakeLists.txt #1169723:1169724
@@ -6,3 +6,4 @@
 add_subdirectory(kdeeduui)
 add_subdirectory(libscience)
 #add_subdirectory(widgets)
+add_subdirectory(qtmmlwidget)
--- trunk/KDE/kdeedu/libkdeedu/keduvocdocument/CMakeLists.txt #1169723:1169724
@@ -70,4 +70,3 @@
     sharedkvtmlfiles.h
     DESTINATION ${INCLUDE_INSTALL_DIR}/libkdeedu  COMPONENT Devel
 )
-