[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kword
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2009-06-16 20:45:32
Message-ID: 1245185132.534289.7890.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 982819 by rempt:
Make KWord compile and link
M +3 -1 CMakeLists.txt
M +3 -3 part/CMakeLists.txt
M +2 -2 part/KWGui.cpp
M +1 -1 part/frames/tests/CMakeLists.txt
M +1 -1 part/tests/CMakeLists.txt
M +3 -2 plugins/scripting/CMakeLists.txt
--- trunk/koffice/kword/CMakeLists.txt #982818:982819
@@ -1,5 +1,7 @@
project(kword)
-
+include_directories(
+ ${KOMAIN_INCLUDES}
+)
add_subdirectory( templates )
add_subdirectory( pics )
add_subdirectory( part )
--- trunk/koffice/kword/part/CMakeLists.txt #982818:982819
@@ -3,7 +3,7 @@
add_subdirectory( frames/tests )
add_subdirectory( tests )
-include_directories( ${KOTEXT_INCLUDES} ${KOGUIUTILS_INCLUDES} \
${KDE4_INCLUDE_DIR}/threadweaver/ ) +include_directories( ${KOTEXT_INCLUDES} \
${KDE4_INCLUDE_DIR}/threadweaver/ )
########### KWordPrivate library ###############
@@ -77,8 +77,8 @@
kde4_add_library(kwordprivate SHARED ${kwordprivate_LIB_SRCS})
-target_link_libraries(kwordprivate ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} \
${KDE4_KPARTS_LIBS} koguiutils kotext)
-target_link_libraries(kwordprivate LINK_INTERFACE_LIBRARIES kotext koguiutils \
${QT_QT3SUPPORT_LIBRARY}) +target_link_libraries(kwordprivate \
${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} komain) \
+target_link_libraries(kwordprivate LINK_INTERFACE_LIBRARIES komain \
${QT_QT3SUPPORT_LIBRARY})
set_target_properties(kwordprivate
PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION \
${GENERIC_KOFFICE_LIB_SOVERSION}
--- trunk/koffice/kword/part/KWGui.cpp #982818:982819
@@ -74,8 +74,8 @@
dockerMng = new KoDockerManager(m_view);
m_view->setDockerManager(dockerMng);
}
- connect(m_canvasController, SIGNAL(toolOptionWidgetsChanged(const QMap<QString, \
QWidget *> &, KoView *)),
- dockerMng, SLOT(newOptionWidgets(const QMap<QString, QWidget *> &, \
KoView *))); + connect(m_canvasController, SIGNAL(toolOptionWidgetsChanged(const \
QMap<QString, QWidget *> &, QWidget*)), + dockerMng, \
SLOT(newOptionWidgets(const QMap<QString, QWidget *> &, QWidget*)));
gridLayout->addWidget(m_horizontalRuler->tabChooser(), 0, 0);
gridLayout->addWidget(m_horizontalRuler, 0, 1);
--- trunk/koffice/kword/part/frames/tests/CMakeLists.txt #982818:982819
@@ -4,7 +4,7 @@
add_definitions(-DCOMPILING_TESTS)
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOTEXT_INCLUDES} \
${KOGUIUTILS_INCLUDES} +include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} \
${KOTEXT_INCLUDES}
${KDE4_INCLUDES} ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/kword/part \
${CMAKE_SOURCE_DIR}/kword/part/frames ${CMAKE_SOURCE_DIR}/libs/flake/tests
)
--- trunk/koffice/kword/part/tests/CMakeLists.txt #982818:982819
@@ -1,7 +1,7 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
add_definitions(-DCOMPILING_TESTS)
-include_directories( ${KOGUIUTILS_INCLUDES} ${KOTEXT_INCLUDES} ${KDE4_INCLUDES} \
${CMAKE_SOURCE_DIR}/libs/flake/tests +include_directories( ${KOTEXT_INCLUDES} \
${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/libs/flake/tests \
${CMAKE_SOURCE_DIR}/kword/part)
########### next target ###############
--- trunk/koffice/kword/plugins/scripting/CMakeLists.txt #982818:982819
@@ -2,7 +2,8 @@
${CMAKE_SOURCE_DIR}/kword/part
${CMAKE_SOURCE_DIR}/kword/part/frames
${KOTEXT_INCLUDES}
- ${KOGUIUTILS_INCLUDES}
+ ${KOPROPERTIES_INCLUDES}
+
${KOKROSS_INCLUDES} )
add_subdirectory( scripts )
@@ -23,7 +24,7 @@
)
kde4_add_plugin(krossmodulekword ${krossmodulekword_PART_SRCS})
-target_link_libraries(krossmodulekword ${QT_QT3SUPPORT_LIBRARY} kotext \
${KDE4_KPARTS_LIBS} kokross kwordprivate) +target_link_libraries(krossmodulekword \
${QT_QT3SUPPORT_LIBRARY} kotext ${KDE4_KPARTS_LIBS} kobase kokross kwordprivate) \
install(TARGETS krossmodulekword DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES \
krossmodulekword.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES \
scripting.rc DESTINATION ${DATA_INSTALL_DIR}/kword/kpartplugins)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic