Commit 8c3e1419 authored by Alex Richardson's avatar Alex Richardson

fix build with latest kdelibs (no more kdecore and kdeui)

parent 9af82266
......@@ -31,7 +31,6 @@ if( UNIX )
endif()
# needed for set_package_properties macro
find_package(LibAttica REQUIRED NO_MODULE ) #somehow this is not searched for
find_package(KDELibs4 REQUIRED NO_MODULE) #needed for KDE4Support
find_package(KDE4Support REQUIRED NO_MODULE)
......@@ -113,7 +112,9 @@ add_subdirectory( designer )
# Okteta Kasten components
add_subdirectory( kasten )
# special mimetypes
add_subdirectory( mimetypes )
#disable this for now, FindSharedMimeInfo is no longer installed by KF5
#TODO fix this
#add_subdirectory( mimetypes )
# programs and parts for desktop
add_subdirectory( parts )
......
......@@ -113,14 +113,16 @@ set( oktetacore_LIB_CCHDRS
)
#don't compile sources twice by using object libraries
#OBJECT libraries seem buggy with regard to automoc, have to call it manually
#automoc4( oktetacore_objs oktetacore_LIB_SRCS )
add_library( oktetacore_objs OBJECT ${oktetacore_LIB_SRCS} )
set_target_properties(oktetacore_objs PROPERTIES POSITION_INDEPENDENT_CODE ON)
set( oktetacore_LIB_OBJS $<TARGET_OBJECTS:oktetacore_objs>)
kde4_add_library( ${oktetacore_LIB} SHARED ${oktetacore_LIB_OBJS} )
target_link_libraries( ${oktetacore_LIB} LINK_PUBLIC ${KDE4_KDECORE_LIBS} ${KDE4Attic_LIBRARIES} )
target_link_libraries( ${oktetacore_LIB} LINK_PUBLIC Qt5::Core )
target_link_libraries( ${oktetacore_LIB} LINK_PRIVATE
KF5::KI18n
KF5::KCodecs #needed for codecs
KF5::KDE4Attic #needed for codecs
)
set_target_properties( ${oktetacore_LIB} PROPERTIES
OUTPUT_NAME ${oktetacore_LIB_NAME}
......@@ -140,8 +142,8 @@ install( FILES ${oktetacore_LIB_CCHDRS}
)
add_subdirectory( piecetable/tests )
add_subdirectory( tests )
if(KDE4_BUILD_TESTS)
kde4_add_library( testoktetacore STATIC ${oktetacore_LIB_OBJS} )
add_subdirectory( piecetable/tests )
add_subdirectory( tests )
endif(KDE4_BUILD_TESTS)
......@@ -58,6 +58,7 @@ class OKTETACORE_EXPORT BookmarksConstIterator
void toFront();
protected:
//TODO: QExplicitlySharedDataPointer
KSharedPtr<BookmarksConstIteratorAdapter> mAdapter;
};
......
......@@ -16,18 +16,17 @@ set( piecetest_SRCS
)
kde4_add_unit_test( piecetest TESTNAME libpiecetable-piecetest ${piecetest_SRCS} )
target_link_libraries( piecetest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( piecetest Qt5::Test )
########### piecetabletest ###############
set( piecetabletest_SRCS
piecetabletest.cpp
${SUTDIR}/piecetable/piecetable.cpp
)
kde4_add_unit_test( piecetabletest TESTNAME libpiecetable-piecetabletest ${piecetabletest_SRCS} )
target_link_libraries( piecetabletest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( piecetabletest testoktetacore Qt5::Test KF5::KI18n )
########### testpiecetablechangetest ###############
......@@ -35,15 +34,13 @@ target_link_libraries( piecetabletest ${KDE4_KDECORE_LIBS} Qt5::Test )
set( testpiecetablechangetest_SRCS
testpiecetablechangetest.cpp
testpiecetablechange.cpp
${SUTDIR}/piecetable/piecetable.cpp
${SUTDIR}/piecetable/abstractpiecetablechange.cpp
)
kde4_add_unit_test( testpiecetablechangetest
TESTNAME libpiecetable-testpiecetablechangetest
${testpiecetablechangetest_SRCS}
)
target_link_libraries( testpiecetablechangetest oktetacoretestutil ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( testpiecetablechangetest testoktetacore oktetacoretestutil Qt5::Test KF5::KI18n )
########### abstractpiecetablechangeiftestsources ###############
......@@ -51,8 +48,6 @@ target_link_libraries( testpiecetablechangetest oktetacoretestutil ${KDE4_KDECO
set( abstractpiecetablechangeiftest_SRCS
abstractpiecetablechangeiftest.cpp
testpiecetablechange.cpp
${SUTDIR}/piecetable/piecetable.cpp
${SUTDIR}/piecetable/abstractpiecetablechange.cpp
)
########### testpiecetablechangeabstractpiecetablechangeiftest ###############
......@@ -67,7 +62,7 @@ kde4_add_unit_test( testpiecetablechangeabstractpiecetablechangeiftest
${testpiecetablechangeabstractpiecetablechangeiftest_SRCS}
)
target_link_libraries( testpiecetablechangeabstractpiecetablechangeiftest
oktetacoretestutil ${KDE4_KDECORE_LIBS} Qt5::Test )
oktetacoretestutil testoktetacore Qt5::Test )
########### insertpiecetablechangeabstractpiecetablechangeiftest ###############
......@@ -75,7 +70,6 @@ target_link_libraries( testpiecetablechangeabstractpiecetablechangeiftest
set( insertpiecetablechangeabstractpiecetablechangeiftest_SRCS
insertpiecetablechangeabstractpiecetablechangeiftest.cpp
${abstractpiecetablechangeiftest_SRCS}
${SUTDIR}/piecetable/insertpiecetablechange.cpp
)
kde4_add_unit_test( insertpiecetablechangeabstractpiecetablechangeiftest
......@@ -83,7 +77,7 @@ kde4_add_unit_test( insertpiecetablechangeabstractpiecetablechangeiftest
${insertpiecetablechangeabstractpiecetablechangeiftest_SRCS}
)
target_link_libraries( insertpiecetablechangeabstractpiecetablechangeiftest
oktetacoretestutil ${KDE4_KDECORE_LIBS} Qt5::Test )
oktetacoretestutil testoktetacore Qt5::Test KF5::KI18n )
########### removepiecetablechangeabstractpiecetablechangeiftest ###############
......@@ -91,7 +85,6 @@ target_link_libraries( insertpiecetablechangeabstractpiecetablechangeiftest
set( removepiecetablechangeabstractpiecetablechangeiftest_SRCS
removepiecetablechangeabstractpiecetablechangeiftest.cpp
${abstractpiecetablechangeiftest_SRCS}
${SUTDIR}/piecetable/removepiecetablechange.cpp
)
kde4_add_unit_test( removepiecetablechangeabstractpiecetablechangeiftest
......@@ -99,7 +92,7 @@ kde4_add_unit_test( removepiecetablechangeabstractpiecetablechangeiftest
${removepiecetablechangeabstractpiecetablechangeiftest_SRCS}
)
target_link_libraries( removepiecetablechangeabstractpiecetablechangeiftest
oktetacoretestutil ${KDE4_KDECORE_LIBS} Qt5::Test )
oktetacoretestutil testoktetacore Qt5::Test KF5::KI18n )
########### replacepiecetablechangeabstractpiecetablechangeiftest ###############
......@@ -107,7 +100,6 @@ target_link_libraries( removepiecetablechangeabstractpiecetablechangeiftest
set( replacepiecetablechangeabstractpiecetablechangeiftest_SRCS
replacepiecetablechangeabstractpiecetablechangeiftest.cpp
${abstractpiecetablechangeiftest_SRCS}
${SUTDIR}/piecetable/replacepiecetablechange.cpp
)
kde4_add_unit_test( replacepiecetablechangeabstractpiecetablechangeiftest
......@@ -115,7 +107,7 @@ kde4_add_unit_test( replacepiecetablechangeabstractpiecetablechangeiftest
${replacepiecetablechangeabstractpiecetablechangeiftest_SRCS}
)
target_link_libraries( replacepiecetablechangeabstractpiecetablechangeiftest
oktetacoretestutil ${KDE4_KDECORE_LIBS} Qt5::Test )
oktetacoretestutil testoktetacore Qt5::Test KF5::KI18n )
########### swaprangespiecetablechangeabstractpiecetablechangeiftest ###############
......@@ -123,7 +115,6 @@ target_link_libraries( replacepiecetablechangeabstractpiecetablechangeiftest
set( swaprangespiecetablechangeabstractpiecetablechangeiftest_SRCS
swaprangespiecetablechangeabstractpiecetablechangeiftest.cpp
${abstractpiecetablechangeiftest_SRCS}
${SUTDIR}/piecetable/swaprangespiecetablechange.cpp
)
kde4_add_unit_test( swaprangespiecetablechangeabstractpiecetablechangeiftest
......@@ -131,7 +122,7 @@ kde4_add_unit_test( swaprangespiecetablechangeabstractpiecetablechangeiftest
${swaprangespiecetablechangeabstractpiecetablechangeiftest_SRCS}
)
target_link_libraries( swaprangespiecetablechangeabstractpiecetablechangeiftest
oktetacoretestutil ${KDE4_KDECORE_LIBS} Qt5::Test )
oktetacoretestutil testoktetacore Qt5::Test KF5::KI18n )
########### grouppiecetablechangeabstractpiecetablechangeiftest ###############
......@@ -141,11 +132,6 @@ if(IWILLPICKUPWORKONOKTETACORE)
set( grouppiecetablechangeabstractpiecetablechangeiftest_SRCS
grouppiecetablechangeabstractpiecetablechangeiftest.cpp
${abstractpiecetablechangeiftest_SRCS}
${SUTDIR}/addressrangelist.cpp
${SUTDIR}/piecetable/replacepiecetablechange.cpp
${SUTDIR}/piecetable/insertpiecetablechange.cpp
${SUTDIR}/piecetable/removepiecetablechange.cpp
${SUTDIR}/piecetable/grouppiecetablechange.cpp
)
kde4_add_unit_test( grouppiecetablechangeabstractpiecetablechangeiftest
......@@ -153,7 +139,7 @@ kde4_add_unit_test( grouppiecetablechangeabstractpiecetablechangeiftest
${grouppiecetablechangeabstractpiecetablechangeiftest_SRCS}
)
target_link_libraries( grouppiecetablechangeabstractpiecetablechangeiftest
oktetacoretestutil ${KDE4_KDECORE_LIBS} Qt5::Test )
oktetacoretestutil testoktetacore Qt5::Test )
endif()
########### grouppiecetablechangetest ###############
......@@ -161,21 +147,13 @@ endif()
set( grouppiecetablechangetest_SRCS
grouppiecetablechangetest.cpp
testpiecetablechange.cpp
${SUTDIR}/addressrangelist.cpp
${SUTDIR}/piecetable/piecetable.cpp
${SUTDIR}/piecetable/abstractpiecetablechange.cpp
${SUTDIR}/piecetable/insertpiecetablechange.cpp
${SUTDIR}/piecetable/removepiecetablechange.cpp
${SUTDIR}/piecetable/replacepiecetablechange.cpp
${SUTDIR}/piecetable/swaprangespiecetablechange.cpp
${SUTDIR}/piecetable/grouppiecetablechange.cpp
)
kde4_add_unit_test( grouppiecetablechangetest
TESTNAME libpiecetable-grouppiecetablechangetest
${grouppiecetablechangetest_SRCS}
)
target_link_libraries( grouppiecetablechangetest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( grouppiecetablechangetest testoktetacore Qt5::Test KF5::KI18n)
########### piecetablechangehistorytest ###############
......@@ -183,42 +161,23 @@ target_link_libraries( grouppiecetablechangetest ${KDE4_KDECORE_LIBS} Qt5::Test
set( piecetablechangehistorytest_SRCS
piecetablechangehistorytest.cpp
testpiecetablechange.cpp
${SUTDIR}/addressrangelist.cpp
${SUTDIR}/piecetable/piecetable.cpp
${SUTDIR}/piecetable/abstractpiecetablechange.cpp
${SUTDIR}/piecetable/insertpiecetablechange.cpp
${SUTDIR}/piecetable/removepiecetablechange.cpp
${SUTDIR}/piecetable/replacepiecetablechange.cpp
${SUTDIR}/piecetable/swaprangespiecetablechange.cpp
${SUTDIR}/piecetable/piecetablechangehistory.cpp
${SUTDIR}/piecetable/grouppiecetablechange.cpp
)
kde4_add_unit_test( piecetablechangehistorytest
TESTNAME libpiecetable-piecetablechangehistorytest
${piecetablechangehistorytest_SRCS}
)
target_link_libraries( piecetablechangehistorytest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( piecetablechangehistorytest testoktetacore Qt5::Test )
########### revertablepiecetabletest ###############
set( revertablepiecetabletest_SRCS
revertablepiecetabletest.cpp
${SUTDIR}/addressrangelist.cpp
${SUTDIR}/piecetable/piecetable.cpp
${SUTDIR}/piecetable/abstractpiecetablechange.cpp
${SUTDIR}/piecetable/insertpiecetablechange.cpp
${SUTDIR}/piecetable/removepiecetablechange.cpp
${SUTDIR}/piecetable/replacepiecetablechange.cpp
${SUTDIR}/piecetable/swaprangespiecetablechange.cpp
${SUTDIR}/piecetable/piecetablechangehistory.cpp
${SUTDIR}/piecetable/revertablepiecetable.cpp
${SUTDIR}/piecetable/grouppiecetablechange.cpp
)
kde4_add_unit_test( revertablepiecetabletest
TESTNAME libpiecetable-revertablepiecetabletest
${revertablepiecetabletest_SRCS}
)
target_link_libraries( revertablepiecetabletest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( revertablepiecetabletest testoktetacore Qt5::Test KF5::KI18n )
......@@ -22,7 +22,7 @@ set( arraychangemetricstest_SRCS
)
kde4_add_unit_test( arraychangemetricstest TESTNAME libokteta-core-arraychangemetricstest ${arraychangemetricstest_SRCS} )
target_link_libraries( arraychangemetricstest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( arraychangemetricstest Qt5::Test )
########### addressrangetest ###############
......@@ -32,7 +32,7 @@ set( addressrangetest_SRCS
)
kde4_add_unit_test( addressrangetest TESTNAME libokteta-core-addressrangetest ${addressrangetest_SRCS} )
target_link_libraries( addressrangetest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( addressrangetest testoktetacore Qt5::Test )
########### addressrangelisttest ###############
......@@ -42,7 +42,7 @@ set( addressrangelisttest_SRCS
)
kde4_add_unit_test( addressrangelisttest TESTNAME libokteta-core-addressrangelisttest ${addressrangelisttest_SRCS} )
target_link_libraries( addressrangelisttest testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( addressrangelisttest testoktetacore Qt5::Test )
########### fixedsizebytearraymodeltest ###############
......@@ -53,7 +53,7 @@ set( fixedsizebytearraymodeltest_SRCS
kde4_add_unit_test( fixedsizebytearraymodeltest TESTNAME libokteta-core-fixedsizebytearraymodeltest ${fixedsizebytearraymodeltest_SRCS})
target_link_libraries( fixedsizebytearraymodeltest
testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test
testoktetacore Qt5::Test KF5::KI18n
)
......@@ -69,7 +69,7 @@ kde4_add_unit_test( fixedsizebytearraymodelabstractbytearraymodeliftest
${fixedsizebytearraymodelabstractbytearraymodeliftest_SRCS}
)
target_link_libraries( fixedsizebytearraymodelabstractbytearraymodeliftest
oktetacoretestutil testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test
oktetacoretestutil testoktetacore Qt5::Test KF5::KI18n
)
......@@ -81,7 +81,7 @@ set( bytearraymodeltest_SRCS
kde4_add_unit_test( bytearraymodeltest TESTNAME libokteta-core-bytearraymodeltest ${bytearraymodeltest_SRCS} )
target_link_libraries( bytearraymodeltest
testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test
${oktetacore_LIB} Qt5::Test
)
......@@ -97,7 +97,7 @@ kde4_add_unit_test( bytearraymodelabstractbytearraymodeliftest
${bytearraymodelabstractbytearraymodeliftest_SRCS}
)
target_link_libraries( bytearraymodelabstractbytearraymodeliftest
oktetacoretestutil testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test
oktetacoretestutil testoktetacore Qt5::Test KF5::KI18n
)
......@@ -113,7 +113,7 @@ kde4_add_unit_test( piecetablebytearraymodelabstractbytearraymodeliftest
${piecetablebytearraymodelabstractbytearraymodeliftest_SRCS}
)
target_link_libraries( piecetablebytearraymodelabstractbytearraymodeliftest
oktetacoretestutil testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test
oktetacoretestutil testoktetacore Qt5::Test KF5::KI18n
)
......@@ -129,7 +129,7 @@ kde4_add_unit_test( piecetablebytearraymodelversionableiftest
${piecetablebytearraymodelversionableiftest_SRCS}
)
target_link_libraries( piecetablebytearraymodelversionableiftest
oktetacoretestutil testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test
oktetacoretestutil ${oktetacore_LIB} Qt5::Test
)
......@@ -141,7 +141,7 @@ set( valuecodectest_SRCS
kde4_add_unit_test( valuecodectest TESTNAME libokteta-core-valuecodectest ${valuecodectest_SRCS})
target_link_libraries( valuecodectest
testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test
${oktetacore_LIB} Qt5::Test
)
......@@ -153,7 +153,7 @@ set( charcodectest_SRCS
kde4_add_unit_test( charcodectest TESTNAME libokteta-core-charcodectest ${charcodectest_SRCS})
target_link_libraries( charcodectest
testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test ${KDE4Attic_LIBRARIES}
${oktetacore_LIB} Qt5::Test KF5::KI18n
)
......@@ -165,7 +165,7 @@ set( textcharcodectest_SRCS
kde4_add_unit_test( textcharcodectest TESTNAME libokteta-core-textcharcodectest ${textcharcodectest_SRCS} )
target_link_libraries( textcharcodectest
testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test ${KDE4Attic_LIBRARIES}
testoktetacore Qt5::Test KF5::KI18n KF5::KCodecs KF5::KDE4Attic
)
......@@ -178,7 +178,7 @@ set( textcharcodeccharcodeciftest_SRCS
kde4_add_unit_test( textcharcodeccharcodeciftest TESTNAME libokteta-core-textcharcodeccharcodeciftest ${textcharcodeccharcodeciftest_SRCS} )
target_link_libraries( textcharcodeccharcodeciftest
testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test ${KDE4Attic_LIBRARIES}
testoktetacore Qt5::Test KF5::KI18n KF5::KCodecs KF5::KDE4Attic
)
......@@ -190,7 +190,7 @@ set( ebcdic1047charcodeccharcodeciftest_SRCS
kde4_add_unit_test( ebcdic1047charcodeccharcodeciftest TESTNAME libokteta-core-ebcdic1047charcodeccharcodeciftest ${ebcdic1047charcodeccharcodeciftest_SRCS} )
target_link_libraries( ebcdic1047charcodeccharcodeciftest
testoktetacore ${KDE4_KDECORE_LIBS} Qt5::Test
testoktetacore Qt5::Test
)
......@@ -201,17 +201,16 @@ set( bookmarktest_SRCS
)
kde4_add_unit_test( bookmarktest TESTNAME libokteta-core-bookmarktest ${bookmarktest_SRCS} )
target_link_libraries( bookmarktest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( bookmarktest Qt5::Test )
########### bookmarklisttest ###############
set( bookmarklisttest_SRCS
bookmarklisttest.cpp
${SUTDIR}/bookmarklist.cpp
)
kde4_add_unit_test( bookmarklisttest TESTNAME libokteta-core-bookmarklisttest ${bookmarklisttest_SRCS} )
target_link_libraries( bookmarklisttest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( bookmarklisttest testoktetacore Qt5::Test KF5::KI18n )
......@@ -124,9 +124,13 @@ set( oktetagui_LIB_CCHDRS
)
kde4_add_library( ${oktetagui_LIB} SHARED ${oktetagui_LIB_SRCS} )
target_link_libraries( ${oktetagui_LIB}
target_link_libraries( ${oktetagui_LIB} LINK_PUBLIC
${oktetacore_LIB}
${KDE4_KDEUI_LIBS}
Qt5::Widgets
)
target_link_libraries( ${oktetagui_LIB} LINK_PRIVATE
KF5::KI18n
KF5::KConfigWidgets
)
set_target_properties( ${oktetagui_LIB} PROPERTIES
OUTPUT_NAME ${oktetagui_LIB_NAME}
......
......@@ -18,7 +18,7 @@ set( selectiontest_SRCS
)
kde4_add_unit_test( selectiontest TESTNAME libokteta-gui-selectiontest ${selectiontest_SRCS} )
target_link_libraries( selectiontest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( selectiontest Qt5::Test )
set_tests_properties(libokteta-gui-selectiontest PROPERTIES LABELS OktetaLabel)
......@@ -29,7 +29,7 @@ set( coordtest_SRCS
)
kde4_add_unit_test( coordtest TESTNAME libokteta-gui-coordtest ${coordtest_SRCS} )
target_link_libraries( coordtest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( coordtest Qt5::Test )
########### coordrangetest ###############
......@@ -39,7 +39,7 @@ set( coordrangetest_SRCS
)
kde4_add_unit_test( coordrangetest TESTNAME libokteta-gui-coordrangetest ${coordrangetest_SRCS} )
target_link_libraries( coordrangetest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( coordrangetest Qt5::Test )
########### coordrangelisttest ###############
......@@ -50,7 +50,7 @@ set( coordrangelisttest_SRCS
)
kde4_add_unit_test( coordrangelisttest TESTNAME libokteta-gui-coordrangelisttest ${coordrangelisttest_SRCS} )
target_link_libraries( coordrangelisttest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( coordrangelisttest Qt5::Test )
########### bytearraytablelayouttest ###############
......@@ -64,7 +64,7 @@ kde4_add_unit_test( bytearraytablelayouttest
TESTNAME libokteta-gui-bytearraytablelayouttest
${bytearraytablelayouttest_SRCS}
)
target_link_libraries( bytearraytablelayouttest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( bytearraytablelayouttest Qt5::Test )
# FIXME:
# this is a rather stupid workaround - you should link to liboktetagui instead
set_target_properties( bytearraytablelayouttest PROPERTIES COMPILE_FLAGS "-DMAKE_OKTETAGUI_LIB" )
......@@ -82,7 +82,7 @@ kde4_add_unit_test( bytearraytablecursortest
TESTNAME libokteta-gui-bytearraytablecursortest
${bytearraytablecursortest_SRCS}
)
target_link_libraries( bytearraytablecursortest ${KDE4_KDECORE_LIBS} Qt5::Test )
target_link_libraries( bytearraytablecursortest Qt5::Test )
# FIXME:
# this is a rather stupid workaround - you should link to liboktetagui instead
set_target_properties( bytearraytablecursortest PROPERTIES COMPILE_FLAGS "-DMAKE_OKTETAGUI_LIB" )
......
......@@ -432,13 +432,15 @@ target_link_libraries ( structures-static
Qt5::Test
Qt5::Script
Qt5::Xml
${KDE4_KDEUI_LIBS}
KF5::KI18n
KF5::KConfigWidgets
${KDE4_KNEWSTUFF3_LIBS}
${KDE4_KCMUTILS_LIBS}
${oktetakastencore_LIB}
${oktetakastengui_LIB}
${oktetacore_LIB}
${KASTENCORE_LIBS}
${KDE4Attic_LIBRARIES}
${KDE4Support_LIBRARIES}
)
......@@ -532,10 +534,11 @@ target_link_libraries( ${oktetakastencontrollers_LIB}
${KASTENCORE_LIBS}
${oktetagui_LIB}
${oktetacore_LIB}
${KDE4_KIO_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KNEWSTUFF3_LIBS}
${KDE4_KCMUTILS_LIBS}
${KDE4_KUTILS_LIBS}
KF5::KI18n
KF5::KConfigWidgets
KF5::KIconThemes
Qt5::Script
Qt5::ScriptTools
${KDE4Attic_LIBRARIES}
......
......@@ -56,7 +56,9 @@ kde4_add_library( ${oktetakastencore_LIB} SHARED ${okteta_kastencore_LIB_SRCS}
target_link_libraries( ${oktetakastencore_LIB} LINK_PUBLIC
${KASTENCORE_LIBS}
${oktetacore_LIB}
${KDE4_KDECORE_LIBS}
)
target_link_libraries( ${oktetakastencore_LIB} LINK_PRIVATE
KF5::KI18n
)
set_target_properties( ${oktetakastencore_LIB} PROPERTIES
......
......@@ -34,6 +34,7 @@ target_link_libraries( bytearraydocumenttest
testoktetacore
${KDE4_KIO_LIBS}
Qt5::Test
KF5::KI18n
)
......@@ -55,4 +56,5 @@ target_link_libraries( bytearraydocumentfactorytest
testoktetacore
${KDE4_KIO_LIBS}
Qt5::Test
KF5::KI18n
)
......@@ -58,6 +58,7 @@ target_link_libraries( bytearrayrawfilesynchronizertest
testoktetacore
${KDE4_KIO_LIBS}
${KDE4Attic_LIBRARIES}
KF5::KI18n
Qt5::Test
)
......@@ -82,5 +83,6 @@ target_link_libraries( bytearrayrawfilesynchronizerfactorytest
oktetacoretestutil
testoktetacore
${KDE4_KIO_LIBS}
KF5::KI18n
Qt5::Test
)
......@@ -192,15 +192,20 @@ set( okteta_kastengui_LIB_HDRS
kde4_add_library( ${oktetakastengui_LIB} SHARED ${okteta_kastengui_LIB_SRCS} )
target_link_libraries( ${oktetakastengui_LIB}
target_link_libraries( ${oktetakastengui_LIB} LINK_PUBLIC
${oktetakastencore_LIB}
${KASTENGUI_LIBS}
${KASTENCORE_LIBS}
${oktetagui_LIB}
${oktetacore_LIB}
${KDE4_KDEUI_LIBS}
)
target_link_libraries( ${oktetakastengui_LIB} LINK_PRIVATE
Qt5::Script
KF5::KI18n
KF5::KCompletion
${KDE4Support_LIBRARIES} #KGlobalSettings
)
set_target_properties( ${oktetakastengui_LIB} PROPERTIES
OUTPUT_NAME ${oktetakastengui_LIB_NAME}
VERSION ${OKTETAKASTEN_LIB_VERSION}
......
......@@ -25,10 +25,10 @@
// lib
#include "abstractbytearraystreamencoder.h"
// KDE
#include <KTextEdit>
#include <KGlobalSettings>
#include <KLocalizedString>
// Qt
#include <QTextEdit>
namespace Kasten2
{
......@@ -36,7 +36,7 @@ namespace Kasten2
ByteArrayTextStreamEncoderPreview::ByteArrayTextStreamEncoderPreview( AbstractByteArrayStreamEncoder* encoder )
: mEncoder( encoder ), mModel( 0 )
{
mWidget = new KTextEdit(); // TODO: use Kate for syntax highlighting
mWidget = new QTextEdit(); // TODO: use Kate for syntax highlighting
mWidget->setReadOnly( true );
mWidget->setLineWrapMode( QTextEdit::NoWrap );
mWidget->setToolTip( i18n("The preview uses maximal the first 100 bytes.") );
......
......@@ -28,7 +28,7 @@
// Kasten ui
#include <abstractselectionview.h>
class KTextEdit;
class QTextEdit;
namespace Kasten2
......@@ -63,7 +63,7 @@ class ByteArrayTextStreamEncoderPreview : public AbstractSelectionView
AbstractModel* mModel;
const AbstractModelSelection* mSelection;
KTextEdit* mWidget;
QTextEdit* mWidget;
};
}
......
......@@ -183,6 +183,7 @@ kde4_add_library( ${kastencontrollers_LIB} SHARED ${kastencontroller_LIB_SRCS} )
target_link_libraries( ${kastencontrollers_LIB}
${kastengui_LIB}
${kastencore_LIB}
KF5::KI18n
${KDE4_KPARTS_LIBS}
${KDE4_KFILE_LIBS}
${KDE4Support_LIBRARIES}
......
......@@ -124,12 +124,9 @@ set( kastencore_LIB_HDRS
)
kde4_add_library( ${kastencore_LIB} SHARED ${kastencore_LIB_SRCS} )
target_link_libraries( ${kastencore_LIB}
${KDE4_KIO_LIBS}
${KDE4_SOLID_LIBS}
Qt5::Widgets
)
set_target_properties( ${kastencore_LIB} PROPERTIES
target_link_libraries( ${kastencore_LIB} LINK_PUBLIC Qt5::Core KF5::KIOCore )
target_link_libraries( ${kastencore_LIB} LINK_PRIVATE KF5::KI18n ${KDE4_KIO_LIBS} KF5::Solid )
set_target_properties( ${kastencore_LIB} PROPERTIES
OUTPUT_NAME ${kastencore_LIB_NAME}
VERSION ${KASTEN_LIB_VERSION}