Commit c12881df authored by Laurent Montel's avatar Laurent Montel 😁

Add -DQT_USE_QSTRINGBUILDER + clean up

parent 1ff52aed
......@@ -100,6 +100,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${accountwizard_SOURCE_DIR})
include_directories(${accountwizard_SOURCE_DIR} ${accountwizard_BINARY_DIR})
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
......
......@@ -77,6 +77,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akonadiconsole_SOURCE_DIR})
set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR})
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
......
......@@ -72,6 +72,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets)
find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
set(WEBENGINE_TYPE "QtWebEngine")
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
......
......@@ -58,16 +58,9 @@ set(akregatorprivate_formatter_SRCS
formatter/articlegrantleeobject.cpp
)
set(akregatorprivate_frame_webengine_SRCS
set(akregatorprivate_frame_SRCS
frame/webengine/webengineframe.cpp
frame/webengine/akrwebengineviewer.cpp
)
set(akregatorprivate_frame_SRCS
${akregatorprivate_frame_webkit_SRCS}
${akregatorprivate_frame_webengine_SRCS}
frame/frame.cpp
frame/mainframe.cpp
frame/framemanager.cpp
......
......@@ -63,6 +63,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${blogilo_SOURCE_DIR})
# Extra package
find_package(KF5GAPI "4.72.0" CONFIG)
add_definitions(-DQT_USE_QSTRINGBUILDER)
include_directories(${blogilo_SOURCE_DIR} ${blogilo_BINARY_DIR})
endif()
......
......@@ -57,6 +57,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${console_SOURCE_DIR})
find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED)
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
include_directories(${console_SOURCE_DIR} ${console_BINARY_DIR})
......
......@@ -38,7 +38,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR})
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql WebEngine WebEngineWidgets)
find_package(Qt5X11Extras NO_MODULE)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
......@@ -60,6 +61,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR})
find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
include_directories(${grantleeditor_SOURCE_DIR} ${grantleeditor_BINARY_DIR})
......
......@@ -31,6 +31,7 @@ target_link_libraries(contactprintthemeeditor
KF5::KaddressbookGrantlee
KF5::PimTextEdit
KF5::I18n
Qt5::WebEngineWidgets
)
install(TARGETS contactprintthemeeditor ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -87,6 +87,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR})
find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5MessageComposer ${KDEPIM_LIB_INSTALLED_VERSION} CONFIG REQUIRED)
include_directories(${importwizard_SOURCE_DIR} ${importwizard_BINARY_DIR})
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
......
......@@ -77,6 +77,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kaddressbook_SOURCE_DIR})
include_directories(${kaddressbook_SOURCE_DIR} ${kaddressbook_BINARY_DIR})
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
set(Prison_MIN_VERSION "1.2.1")
......
......@@ -130,7 +130,6 @@ kconfig_add_kcfg_files(kalarm_bin_SRCS GENERATE_MOC kalarmconfig.kcfgc)
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/appicons/*-apps-kalarm.png")
ecm_add_app_icon(kalarm_bin_SRCS ICONS ${ICONS_SRCS})
add_executable(kalarm_bin ${kalarm_bin_SRCS})
add_dependencies(kalarm_bin kmail_interface_xml)
set_target_properties(kalarm_bin PROPERTIES OUTPUT_NAME kalarm)
......
......@@ -153,6 +153,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
find_package(MailTransportDBusService CONFIG REQUIRED)
find_package(Boost 1.34.0)
set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h )
......
project(knotes)
add_definitions(-DTRANSLATION_DOMAIN=\"knotes\")
configure_file(config-knotes.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-knotes.h )
......
......@@ -69,6 +69,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kontact_SOURCE_DIR})
find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
set(WEBENGINE_TYPE "QtWebEngine")
add_definitions(-DQT_USE_QSTRINGBUILDER)
include_directories(${kontact_SOURCE_DIR} ${kontact_BINARY_DIR})
endif()
......
......@@ -123,6 +123,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${korganizer_SOURCE_DIR})
endif()
find_package(Boost 1.34.0)
set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
add_definitions(-DQT_USE_QSTRINGBUILDER)
set(KDEPIM_HAVE_X11 ${X11_FOUND})
endif()
......
......@@ -29,6 +29,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${ktnef_SOURCE_DIR})
find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED)
include_directories(${ktnef_SOURCE_DIR} ${ktnef_BINARY_DIR} ${ktnef_BINARY_DIR}/src)
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
include(TestBigEndian)
......
......@@ -54,6 +54,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${mboximporter_SOURCE_DIR})
find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5MailImporter ${LIBMAILIMPORTER_VERSION_LIB} CONFIG REQUIRED)
include_directories(${mboximporter_SOURCE_DIR} ${mboximporter_BINARY_DIR})
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
......
......@@ -73,6 +73,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${pimsettingexporter_SOURCE_DIR})
set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
include_directories(${pimsettingexporter_SOURCE_DIR} ${pimsettingexporter_BINARY_DIR})
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
......
......@@ -65,6 +65,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR})
find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION_LIB} CONFIG REQUIRED)
include_directories(${sieveeditor_SOURCE_DIR} ${sieveeditor_BINARY_DIR})
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
......
......@@ -62,6 +62,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${storageservicemanager_SOURCE_DIR})
find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
include_directories(${storageservicemanager_SOURCE_DIR} ${storageservicemanager_BINARY_DIR})
add_definitions(-DQT_USE_QSTRINGBUILDER)
endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment