[calligra] /: Qt3Support is also needed in Calligra.

[Adam Pigg]

thanks for the list of problem areas, even if we can't resolve then all in
kexi, I'll take a look at some to reduce the numbers

-- 
Sent from my Nokia N9

On 02/12/2011 8:25 Boudewijn Rempt wrote:
On Thursday 01 December 2011 Dec, Jos van den Oever wrote:
> Git commit aa83cf10c9031b8bb33bc191dbacf9fab663d736 by Jos van den Oever.
> Committed on 01/12/2011 at 23:36.
> Pushed by vandenoever into branch 'master'.
>
> Qt3Support is also needed in Calligra.

Hm... We really have to get rid of that, it won't be supported in Qt5
anymore. Maybe we can start by adding a switch that disables everything
that links to qt3support -- something like the attached patch.

It's used in plan:

./plan/plugins/filters/icalendar/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)

In two tables filters (removed for gnumeric)

./filters/tables/gnumeric/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/tables/latex/export/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)

xlst filter:

./filters/xsltfilter/import/CMakeLists.txt:target_link_libraries(xsltimport
komain ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY})
./filters/xsltfilter/export/CMakeLists.txt:target_link_libraries(xsltexport
komain ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY})
./filters/xsltfilter/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)

kchart's svg support:

./filters/kchart/svg/CMakeLists.txt:target_link_libraries(kchartsvgexport
kchartcommon komain ${QT_QT3SUPPORT_LIBRARY})

karbon's eps filter:

./filters/karbon/eps/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)

lots of Words filters that don't work at all anymore anyway:

./filters/words/palmdoc/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/applixword/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/wml/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/oowriter/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/oowriter/CMakeLists.txt:target_link_libraries(oowriterimport
wordsexportfilters komain ${QT_QT3SUPPORT_LIBRARY})
./filters/words/mswrite/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/mswrite/CMakeLists.txt:target_link_libraries(mswriteimport
komain ${QT_QT3SUPPORT_LIBRARY})
./filters/words/docbook/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/wordperfect/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/rtf/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/kword1.3/import/CMakeLists.txt:target_link_libraries(kwordkword1dot3import
komain ${QT_QT3SUPPORT_LIBRARY})
./filters/words/kword1.3/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/amipro/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/hancomword/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/html/export/CMakeLists.txt:target_link_libraries(htmlexport
wordsexportfilters ${QT_QT3SUPPORT_LIBRARY})
./filters/words/html/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./filters/words/abiword/CMakeLists.txt:add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)

braindump (removed in patch)

./braindump/src/CMakeLists.txt:target_link_libraries(braindump
${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KPARTS_LIBS}
${KDE4_KDEUI_LIBS} flake kotext kowidgets braindumpcore komain)

in lots of places in kexi...

./kexi/formeditor/factories/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/formeditor/factories/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/widget/relations/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/widget/dataviewcommon/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/widget/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/widget/utils/CMakeLists.txt:  ${QT_QT3SUPPORT_LIBRARY}
./kexi/widget/tableview/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/main/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/kexidb/drivers/xbase/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/tests/newapi/CMakeLists.txt:target_link_libraries(kexidbtest
${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} kexidb kexiextendedwidgets
kexidatatable kexicore )
./kexi/CMakeLists.txt:  add_definitions(-DQT3_SUPPORT
-DQT3_SUPPORT_WARNINGS)
./kexi/CMakeLists.txt:    ${KDE4_KFILE_LIBS} ${QT_QT3SUPPORT_LIBRARY}
./kexi/migration/mysql/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/migration/sybase/CMakeLists.txt: ${KDE4_KPARTS_LIBS}
${QT_QT3SUPPORT_LIBRARY} kexiutils kexidb keximigrate )
./kexi/migration/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/migration/xbase/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/tables/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/relations/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/queries/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/forms/widgets/webbrowser/CMakeLists.txt:
 ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/forms/widgets/mapbrowser/CMakeLists.txt:
 ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/forms/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/forms/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/forms/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/scripting/kexiscripting/CMakeLists.txt:
 ${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/shapes/relationdesign/CMakeLists.txt:${QT_QT3SUPPORT_LIBRARY}
./kexi/plugins/reports/CMakeLists.txt:    ${QT_QT3_SUPPORT_LIBRARY}
./kexi/plugins/importexport/csv/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}

_Not_ in kdchart -- this line is commented out. Removed in patch.

./plugins/chartshape/kdchart/src/CMakeLists.txt:#target_link_libraries(kdchart
${QT_QT3SUPPORT_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY} )

The new web plugin for kexi. Removed in patch.

./plugins/reporting/web/CMakeLists.txt:    ${QT_QT3SUPPORT_LIBRARY}


--
Boudewijn Rempt
http://www.valdyas.org, http://www.krita.org, http://www.boudewijnrempt.nl

_______________________________________________
calligra-devel mailing list
calligra-devel at kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20111202/24d57c20/attachment.htm>