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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4285695..08f856c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ option(GHNS "support Get Hot New Stuff" ON)
option(NEPOMUK "support NEPOMUK Tagging" ON)
option(TINY "compile a tiny Calligra" OFF)
option(CREATIVEONLY "compile only Karbon and Krita" OFF)
+option(QT3SUPPORT "Build the parts of Calligra that still depend on Qt3" ON)
IF (TINY)
set(SHOULD_BUILD_WORDS TRUE)
@@ -108,14 +109,17 @@ endif(KDE4_BUILD_TESTS)
set(KDE_MIN_VERSION "4.3.0")
find_package(KDE4 4.3.0 REQUIRED)
-find_package(Qt4 4.6.0 REQUIRED QtCore QtGui QtXml QtScript QtSvg QtTest QtWebKit QtDBus QtOpenGL Qt3Support)
+if (QT3SUPPORT)
+ find_package(Qt4 4.6.0 REQUIRED QtCore QtGui QtXml QtScript QtSvg QtTest QtWebKit QtDBus QtOpenGL Qt3Support)
+else (QT3SUPPORT)
+ find_package(Qt4 4.6.0 REQUIRED QtCore QtGui QtXml QtScript QtSvg QtTest QtWebKit QtDBus QtOpenGL)
+endif (QT3SUPPORT)
include(KDE4Defaults)
include(MacroLibrary)
include (MacroAdditionalCleanFiles)
include (MacroAddFileDependencies)
-option(GHNS "support Get Hot New Stuff" ON)
if(NOT ${KDE_VERSION} VERSION_GREATER 4.4.0)
set(GHNS FALSE)
endif(NOT ${KDE_VERSION} VERSION_GREATER 4.4.0)
@@ -490,6 +494,10 @@ endif (NOT QT_QTDECLARATIVE_FOUND)
# set (SHOULD_BUILD_KEXI FALSE)
#endif(NOT QIMAGEBLITZ_FOUND)
+if (NOT QT3SUPPORT)
+ set (SHOULD_BUILD_KEXI FALSE)
+endif (NOT QT3SUPPORT)
+
### HACK ###
# Those BUILD_ are illegally used below before they are defined, which cause problem on a first build
option(BUILD_kexi "Build directory kexi" ON)
diff --git a/braindump/src/CMakeLists.txt b/braindump/src/CMakeLists.txt
index 36698f5..c009e20 100644
--- a/braindump/src/CMakeLists.txt
+++ b/braindump/src/CMakeLists.txt
@@ -44,6 +44,6 @@ kde4_add_ui_files(braindump_SRCS
kde4_add_executable(braindump ${braindump_SRCS})
-target_link_libraries(braindump ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} flake kotext kowidgets braindumpcore komain)
+target_link_libraries(braindump ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} flake kotext kowidgets braindumpcore komain)
install(TARGETS braindump ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt
index c6af197..f65078c 100644
--- a/filters/CMakeLists.txt
+++ b/filters/CMakeLists.txt
@@ -75,8 +75,8 @@ if(SHOULD_BUILD_KPLATO)
macro_optional_add_subdirectory(kplato)
endif(SHOULD_BUILD_KPLATO)
-if(NOT TINY AND LIBXML2_FOUND AND LIBXSLT_FOUND AND NOT WIN32 AND NOT QT_MAC_USE_COCOA)
+if(NOT TINY AND LIBXML2_FOUND AND LIBXSLT_FOUND AND NOT WIN32 AND NOT QT_MAC_USE_COCOA AND QT3SUPPORT)
add_subdirectory(xsltfilter)
-endif(NOT TINY AND LIBXML2_FOUND AND LIBXSLT_FOUND AND NOT WIN32 AND NOT QT_MAC_USE_COCOA)
+endif(NOT TINY AND LIBXML2_FOUND AND LIBXSLT_FOUND AND NOT WIN32 AND NOT QT_MAC_USE_COCOA AND QT3SUPPORT)
########### install files ###############
diff --git a/filters/karbon/CMakeLists.txt b/filters/karbon/CMakeLists.txt
index ff42f8a..da77342 100644
--- a/filters/karbon/CMakeLists.txt
+++ b/filters/karbon/CMakeLists.txt
@@ -32,7 +32,9 @@ if (WPD_FOUND AND LIBWPG_FOUND)
endif (WPD_FOUND AND LIBWPG_FOUND)
add_subdirectory( wmf )
add_subdirectory( karbon1.x )
-add_subdirectory( eps )
+if (QT3SUPPORT)
+ add_subdirectory( eps )
+endif (QT3SUPPORT)
if (POPPLER_FOUND)
add_subdirectory( pdf )
endif (POPPLER_FOUND)
diff --git a/filters/kchart/CMakeLists.txt b/filters/kchart/CMakeLists.txt
index 09c44dc..0c5f24f 100644
--- a/filters/kchart/CMakeLists.txt
+++ b/filters/kchart/CMakeLists.txt
@@ -5,4 +5,6 @@ include_directories(
)
add_subdirectory( genericimageexport )
-add_subdirectory( svg )
+if (QT3SUPPORT)
+ add_subdirectory( svg )
+endif (QT3SUPPORT)
diff --git a/filters/tables/CMakeLists.txt b/filters/tables/CMakeLists.txt
index c07c307..fac2a4f 100644
--- a/filters/tables/CMakeLists.txt
+++ b/filters/tables/CMakeLists.txt
@@ -12,7 +12,9 @@ if(NOT TINY)
if(NOT WIN32 AND NOT QT_MAC_USE_COCOA)
add_subdirectory( html )
- add_subdirectory( latex )
+ if (QT3SUPPORT)
+ add_subdirectory( latex )
+ endif (QT3SUPPORT)
endif(NOT WIN32 AND NOT QT_MAC_USE_COCOA)
endif(NOT TINY)
diff --git a/filters/tables/gnumeric/CMakeLists.txt b/filters/tables/gnumeric/CMakeLists.txt
index 57ace0b..bd104c1 100644
--- a/filters/tables/gnumeric/CMakeLists.txt
+++ b/filters/tables/gnumeric/CMakeLists.txt
@@ -1,5 +1,5 @@
include_directories( ${CMAKE_SOURCE_DIR}/tables ${KDE4_INCLUDES} ${KOMAIN_INCLUDES} )
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+#add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
set(gnumericexport_PART_SRCS gnumericexport.cc )
kde4_add_plugin(gnumericexport ${gnumericexport_PART_SRCS})
diff --git a/filters/words/CMakeLists.txt b/filters/words/CMakeLists.txt
index c368aec..30a04c3 100644
--- a/filters/words/CMakeLists.txt
+++ b/filters/words/CMakeLists.txt
@@ -64,21 +64,22 @@ if (NOT TINY)
add_subdirectory( docbook )
add_subdirectory( html-odf )
- #html FIXME: export dialog is Qt 3 version ui file
- if(NOT WIN32 AND NOT QT_MAC_USE_COCOA)
- add_subdirectory( html )
+ if(NOT WIN32 AND NOT QT_MAC_USE_COCOA AND QT3SUPPORT)
# if (TARGET kowmf)
# add_subdirectory( mswrite )
# endif (TARGET kowmf)
- add_subdirectory( kword1.3 )
- add_subdirectory( hancomword )
- message(STATUS "When latex is reactivated (if?) also port it to GraphicsMagick, to make life easy for Isaac.")
- #add_subdirectory( latex )
- endif(NOT WIN32 AND NOT QT_MAC_USE_COCOA)
+ add_subdirectory( html )
+ add_subdirectory( kword1.3 )
+ add_subdirectory( hancomword )
+ add_subdirectory( oowriter )
+ #add_subdirectory( latex )
+ endif(NOT WIN32 AND NOT QT_MAC_USE_COCOA AND QT3SUPPORT)
+
- add_subdirectory( oowriter )
add_subdirectory( palmdoc )
- add_subdirectory( wml )
+ if (QT3SUPPORT)
+ add_subdirectory( wml )
+ endif (QT3SUPPORT)
if(DCMTK_FOUND)
add_subdirectory( dcm )
diff --git a/filters/words/abiword/CMakeLists.txt b/filters/words/abiword/CMakeLists.txt
index fa05d8a..0ce66e5 100644
--- a/filters/words/abiword/CMakeLists.txt
+++ b/filters/words/abiword/CMakeLists.txt
@@ -1,8 +1,3 @@
-
-
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
-
########### next target ###############
set(abiwordimport_PART_SRCS
diff --git a/filters/words/amipro/CMakeLists.txt b/filters/words/amipro/CMakeLists.txt
index 3d65f98..c70a39d 100644
--- a/filters/words/amipro/CMakeLists.txt
+++ b/filters/words/amipro/CMakeLists.txt
@@ -1,9 +1,3 @@
-
-
-
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
-
########### next target ###############
set(amiproimport_PART_SRCS amiproimport.cc amiproparser.cpp )
diff --git a/filters/words/applixword/CMakeLists.txt b/filters/words/applixword/CMakeLists.txt
index 289e97e..242a0d7 100644
--- a/filters/words/applixword/CMakeLists.txt
+++ b/filters/words/applixword/CMakeLists.txt
@@ -1,7 +1,3 @@
-
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
-
########### next target ###############
set(applixwordimport_PART_SRCS applixwordimport.cc )
diff --git a/filters/words/palmdoc/CMakeLists.txt b/filters/words/palmdoc/CMakeLists.txt
index a0af092..bab90f9 100644
--- a/filters/words/palmdoc/CMakeLists.txt
+++ b/filters/words/palmdoc/CMakeLists.txt
@@ -1,9 +1,3 @@
-
-
-
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
-
########### next target ###############
set(palmdocimport_PART_SRCS palmdocimport.cc palmdb.cpp palmdoc.cpp )
diff --git a/filters/words/rtf/CMakeLists.txt b/filters/words/rtf/CMakeLists.txt
index 537c6c3..5389b7c 100644
--- a/filters/words/rtf/CMakeLists.txt
+++ b/filters/words/rtf/CMakeLists.txt
@@ -1,6 +1,3 @@
-
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
add_subdirectory( export )
add_subdirectory( import )
diff --git a/filters/words/wordperfect/CMakeLists.txt b/filters/words/wordperfect/CMakeLists.txt
index 43f54ac..03ab8ee 100644
--- a/filters/words/wordperfect/CMakeLists.txt
+++ b/filters/words/wordperfect/CMakeLists.txt
@@ -1,6 +1,3 @@
-
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
add_subdirectory( import )
add_subdirectory( export )
diff --git a/plan/plugins/filters/CMakeLists.txt b/plan/plugins/filters/CMakeLists.txt
index c3115da..a2b2636 100644
--- a/plan/plugins/filters/CMakeLists.txt
+++ b/plan/plugins/filters/CMakeLists.txt
@@ -1,7 +1,7 @@
-if(KdepimLibs_FOUND)
+if(KdepimLibs_FOUND AND QT3SUPPORT)
macro_optional_add_subdirectory( icalendar )
-endif(KdepimLibs_FOUND)
+endif(KdepimLibs_FOUND AND QT3SUPPORT)
if(WIN32)
#disable for now
diff --git a/plugins/chartshape/kdchart/src/CMakeLists.txt b/plugins/chartshape/kdchart/src/CMakeLists.txt
index b1266c7..0c62a5d 100644
--- a/plugins/chartshape/kdchart/src/CMakeLists.txt
+++ b/plugins/chartshape/kdchart/src/CMakeLists.txt
@@ -116,7 +116,6 @@ qt_wrap_cpp(kdchart kdchart_LIB_SRCS KDChartEnums.h)
kde4_add_library(kdchart SHARED ${kdchart_LIB_SRCS})
-#target_link_libraries(kdchart ${QT_QT3SUPPORT_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY} )
target_link_libraries(kdchart ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY} )
set_target_properties(kdchart PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
diff --git a/plugins/reporting/web/CMakeLists.txt b/plugins/reporting/web/CMakeLists.txt
index 556a990..d2cd393 100644
--- a/plugins/reporting/web/CMakeLists.txt
+++ b/plugins/reporting/web/CMakeLists.txt
@@ -31,7 +31,6 @@ target_link_libraries(koreport_webplugin
${QT_QTGUI_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${QT_QTXML_LIBRARY}
- ${QT_QT3SUPPORT_LIBRARY}
)
########### install files ###############
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
