diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,6 +109,9 @@ -DQT_DISABLE_DEPRECATED_BEFORE=0x050500 -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_NO_URL_CAST_FROM_STRING + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY -DQT_STRICT_ITERATORS -DQT_USE_QSTRINGBUILDER -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + find_package(KF5Plasma CONFIG) set_package_properties(KF5Plasma PROPERTIES PURPOSE "Plasma libraries for enabling the plasma addons" diff --git a/kdevplatform/CMakeLists.txt b/kdevplatform/CMakeLists.txt --- a/kdevplatform/CMakeLists.txt +++ b/kdevplatform/CMakeLists.txt @@ -56,12 +56,6 @@ set(COMPILER_OPTIMIZATIONS_DISABLED FALSE) endif() -add_definitions( - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_BYTEARRAY -) - add_subdirectory(sublime) add_subdirectory(interfaces) add_subdirectory(project) diff --git a/plugins/android/CMakeLists.txt b/plugins/android/CMakeLists.txt --- a/plugins/android/CMakeLists.txt +++ b/plugins/android/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevandroid\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_qt_declare_logging_category(androidplugin_SRCS HEADER debug_android.h IDENTIFIER ANDROID diff --git a/plugins/appwizard/CMakeLists.txt b/plugins/appwizard/CMakeLists.txt --- a/plugins/appwizard/CMakeLists.txt +++ b/plugins/appwizard/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevappwizard\") -########### next target ############### +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set(kdevappwizard_PART_SRCS appwizardplugin.cpp diff --git a/plugins/astyle/3rdparty/libastyle/CMakeLists.txt b/plugins/astyle/3rdparty/libastyle/CMakeLists.txt --- a/plugins/astyle/3rdparty/libastyle/CMakeLists.txt +++ b/plugins/astyle/3rdparty/libastyle/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(astylelib_SRCS ASBeautifier.cpp ASEnhancer.cpp diff --git a/plugins/astyle/CMakeLists.txt b/plugins/astyle/CMakeLists.txt --- a/plugins/astyle/CMakeLists.txt +++ b/plugins/astyle/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevastyle\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_qt_declare_logging_category(kdevastyle_LOG_SRCS HEADER debug.h IDENTIFIER KDEV_ASTYLE diff --git a/plugins/astyle/tests/CMakeLists.txt b/plugins/astyle/tests/CMakeLists.txt --- a/plugins/astyle/tests/CMakeLists.txt +++ b/plugins/astyle/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/..) set(test_astyle_SRCS test_astyle.cpp diff --git a/plugins/bazaar/CMakeLists.txt b/plugins/bazaar/CMakeLists.txt --- a/plugins/bazaar/CMakeLists.txt +++ b/plugins/bazaar/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevbazaar\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevbazaar_SRCS diffjob.cpp bzrannotatejob.cpp diff --git a/plugins/bazaar/tests/CMakeLists.txt b/plugins/bazaar/tests/CMakeLists.txt --- a/plugins/bazaar/tests/CMakeLists.txt +++ b/plugins/bazaar/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + # Running the test only makes sense if the bzr command line client # is present. So check for it before adding the test... FIND_PROGRAM(BZR_FOUND NAMES bzr) diff --git a/plugins/clang/CMakeLists.txt b/plugins/clang/CMakeLists.txt --- a/plugins/clang/CMakeLists.txt +++ b/plugins/clang/CMakeLists.txt @@ -12,10 +12,6 @@ add_subdirectory(tests) endif() -add_definitions( - -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -) - # TODO: Move to kdevplatform function(add_private_library target) set(options) diff --git a/plugins/clang/tests/CMakeLists.txt b/plugins/clang/tests/CMakeLists.txt --- a/plugins/clang/tests/CMakeLists.txt +++ b/plugins/clang/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + add_executable(clang-parser clang-parser.cpp ) diff --git a/plugins/clazy/tests/CMakeLists.txt b/plugins/clazy/tests/CMakeLists.txt --- a/plugins/clazy/tests/CMakeLists.txt +++ b/plugins/clazy/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_add_test( test_clazyjob.cpp diff --git a/plugins/cmake/CMakeLists.txt b/plugins/cmake/CMakeLists.txt --- a/plugins/cmake/CMakeLists.txt +++ b/plugins/cmake/CMakeLists.txt @@ -1,4 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcmake\") + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/parser) if(BUILD_TESTING) diff --git a/plugins/cmake/tests/CMakeLists.txt b/plugins/cmake/tests/CMakeLists.txt --- a/plugins/cmake/tests/CMakeLists.txt +++ b/plugins/cmake/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + configure_file("paths.h.cmake" "cmake-test-paths.h" ESCAPE_QUOTES) set(commonlibs Qt5::Test Qt5::Core KDev::Interfaces kdevcmakecommon) diff --git a/plugins/cmakebuilder/CMakeLists.txt b/plugins/cmakebuilder/CMakeLists.txt --- a/plugins/cmakebuilder/CMakeLists.txt +++ b/plugins/cmakebuilder/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcmakebuilder\") -########### next target ############### +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set(cmakebuilder_SRCS cmakebuilder.cpp diff --git a/plugins/codeutils/CMakeLists.txt b/plugins/codeutils/CMakeLists.txt --- a/plugins/codeutils/CMakeLists.txt +++ b/plugins/codeutils/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcodeutils\") -########### install target ############### +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set(kdevcodeutils_PART_SRCS codeutilsplugin.cpp diff --git a/plugins/contextbrowser/CMakeLists.txt b/plugins/contextbrowser/CMakeLists.txt --- a/plugins/contextbrowser/CMakeLists.txt +++ b/plugins/contextbrowser/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcontextbrowser\") -########### next target ############### +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set(kdevcontextbrowser_PART_SRCS contextbrowser.cpp diff --git a/plugins/cppcheck/CMakeLists.txt b/plugins/cppcheck/CMakeLists.txt --- a/plugins/cppcheck/CMakeLists.txt +++ b/plugins/cppcheck/CMakeLists.txt @@ -1,11 +1,5 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcppcheck\") -add_definitions( - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_BYTEARRAY -) - find_package(Cppcheck QUIET) set_package_properties(Cppcheck PROPERTIES DESCRIPTION "A tool for static C/C++ code analysis" diff --git a/plugins/custom-buildsystem/CMakeLists.txt b/plugins/custom-buildsystem/CMakeLists.txt --- a/plugins/custom-buildsystem/CMakeLists.txt +++ b/plugins/custom-buildsystem/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcustombuildsystem\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_qt_declare_logging_category(custom_LOG_SRCS HEADER debug.h IDENTIFIER CUSTOMBUILDSYSTEM diff --git a/plugins/custom-buildsystem/tests/CMakeLists.txt b/plugins/custom-buildsystem/tests/CMakeLists.txt --- a/plugins/custom-buildsystem/tests/CMakeLists.txt +++ b/plugins/custom-buildsystem/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + configure_file(testconfig.h.in testconfig.h) ecm_add_test(test_custombuildsystemplugin.cpp ${custom_LOG_SRCS} diff --git a/plugins/custom-definesandincludes/CMakeLists.txt b/plugins/custom-definesandincludes/CMakeLists.txt --- a/plugins/custom-definesandincludes/CMakeLists.txt +++ b/plugins/custom-definesandincludes/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcustomdefinesandincludes\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_qt_declare_logging_category(kdevdefinesandincludesmanager_LOG_SRCS HEADER debug.h IDENTIFIER DEFINESANDINCLUDES diff --git a/plugins/custom-definesandincludes/compilerprovider/tests/CMakeLists.txt b/plugins/custom-definesandincludes/compilerprovider/tests/CMakeLists.txt --- a/plugins/custom-definesandincludes/compilerprovider/tests/CMakeLists.txt +++ b/plugins/custom-definesandincludes/compilerprovider/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..) set(test_compilerprovider_SRCS diff --git a/plugins/custom-definesandincludes/tests/CMakeLists.txt b/plugins/custom-definesandincludes/tests/CMakeLists.txt --- a/plugins/custom-definesandincludes/tests/CMakeLists.txt +++ b/plugins/custom-definesandincludes/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) set(test_definesandincludes_SRCS diff --git a/plugins/custommake/CMakeLists.txt b/plugins/custommake/CMakeLists.txt --- a/plugins/custommake/CMakeLists.txt +++ b/plugins/custommake/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcustommake\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevcustommakemanager_PART_SRCS custommakemanager.cpp custommakemodelitems.cpp diff --git a/plugins/custommake/makefileresolver/tests/CMakeLists.txt b/plugins/custommake/makefileresolver/tests/CMakeLists.txt --- a/plugins/custommake/makefileresolver/tests/CMakeLists.txt +++ b/plugins/custommake/makefileresolver/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(test_custommake_SRCS test_custommake.cpp ) diff --git a/plugins/customscript/CMakeLists.txt b/plugins/customscript/CMakeLists.txt --- a/plugins/customscript/CMakeLists.txt +++ b/plugins/customscript/CMakeLists.txt @@ -1,4 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcustomscript\") + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevcustomscript_PART_SRCS customscript_plugin.cpp ) diff --git a/plugins/cvs/CMakeLists.txt b/plugins/cvs/CMakeLists.txt --- a/plugins/cvs/CMakeLists.txt +++ b/plugins/cvs/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcvs\") -########### next target ############### +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) ecm_qt_declare_logging_category(kdevcvs_LOG_PART_SRCS HEADER debug.h diff --git a/plugins/cvs/tests/CMakeLists.txt b/plugins/cvs/tests/CMakeLists.txt --- a/plugins/cvs/tests/CMakeLists.txt +++ b/plugins/cvs/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + # Due to the use of system() and some unix-style paths this test will only run # under Linux. (Maybe this can be fixed later) # diff --git a/plugins/debuggercommon/CMakeLists.txt b/plugins/debuggercommon/CMakeLists.txt --- a/plugins/debuggercommon/CMakeLists.txt +++ b/plugins/debuggercommon/CMakeLists.txt @@ -1,4 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevdebuggercommon\") + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(debuggercommon_SRCS mi/mi.cpp mi/milexer.cpp diff --git a/plugins/debuggercommon/tests/CMakeLists.txt b/plugins/debuggercommon/tests/CMakeLists.txt --- a/plugins/debuggercommon/tests/CMakeLists.txt +++ b/plugins/debuggercommon/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + get_filename_component(GDB_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../gdb ABSOLUTE) get_filename_component(LLDB_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../lldb ABSOLUTE) configure_file(debuggers-tests-config.h.in debuggers-tests-config.h) diff --git a/plugins/docker/CMakeLists.txt b/plugins/docker/CMakeLists.txt --- a/plugins/docker/CMakeLists.txt +++ b/plugins/docker/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + kdevplatform_add_file_templates(dockerfile-template) if(BUILD_TESTING) diff --git a/plugins/docker/tests/CMakeLists.txt b/plugins/docker/tests/CMakeLists.txt --- a/plugins/docker/tests/CMakeLists.txt +++ b/plugins/docker/tests/CMakeLists.txt @@ -1,2 +1,8 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_add_test(test_docker.cpp LINK_LIBRARIES Qt5::Test Qt5::Core KDev::Interfaces KDevPlatformTests) diff --git a/plugins/documentswitcher/CMakeLists.txt b/plugins/documentswitcher/CMakeLists.txt --- a/plugins/documentswitcher/CMakeLists.txt +++ b/plugins/documentswitcher/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevdocumentswitcher\") -########### next target ############### +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set(kdevdocumentswitcher_PART_SRCS documentswitcherplugin.cpp diff --git a/plugins/execute/CMakeLists.txt b/plugins/execute/CMakeLists.txt --- a/plugins/execute/CMakeLists.txt +++ b/plugins/execute/CMakeLists.txt @@ -1,5 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevexecute\") -########### next target ############### + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set(kdevexecute_PART_SRCS diff --git a/plugins/executeplasmoid/CMakeLists.txt b/plugins/executeplasmoid/CMakeLists.txt --- a/plugins/executeplasmoid/CMakeLists.txt +++ b/plugins/executeplasmoid/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevexecuteplasmoid\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevexecuteplasmoid_PART_SRCS executeplasmoidplugin.cpp plasmoidexecutionconfig.cpp diff --git a/plugins/executescript/CMakeLists.txt b/plugins/executescript/CMakeLists.txt --- a/plugins/executescript/CMakeLists.txt +++ b/plugins/executescript/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevexecutescript\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevexecutescript_PART_SRCS executescriptplugin.cpp scriptappconfig.cpp diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt --- a/plugins/filetemplates/CMakeLists.txt +++ b/plugins/filetemplates/CMakeLists.txt @@ -1,4 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevfiletemplates\") + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevfiletemplates_PART_SRCS templatepreview.cpp templatepreviewtoolview.cpp diff --git a/plugins/filetemplates/tests/CMakeLists.txt b/plugins/filetemplates/tests/CMakeLists.txt --- a/plugins/filetemplates/tests/CMakeLists.txt +++ b/plugins/filetemplates/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + configure_file(tests_config.h.cmake tests_config.h) add_subdirectory(data/testgenerationtest/templates) diff --git a/plugins/flatpak/CMakeLists.txt b/plugins/flatpak/CMakeLists.txt --- a/plugins/flatpak/CMakeLists.txt +++ b/plugins/flatpak/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + kdevplatform_add_file_templates(flatpak-template) add_definitions(-DTRANSLATION_DOMAIN=\"kdevflatpak\") diff --git a/plugins/gdb/CMakeLists.txt b/plugins/gdb/CMakeLists.txt --- a/plugins/gdb/CMakeLists.txt +++ b/plugins/gdb/CMakeLists.txt @@ -5,6 +5,12 @@ TYPE OPTIONAL) add_definitions(-DTRANSLATION_DOMAIN=\"kdevgdb\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevgdb_SRCS gdb.cpp gdboutputwidget.cpp diff --git a/plugins/gdb/unittests/CMakeLists.txt b/plugins/gdb/unittests/CMakeLists.txt --- a/plugins/gdb/unittests/CMakeLists.txt +++ b/plugins/gdb/unittests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_add_test(test_gdb.cpp LINK_LIBRARIES kdevgdb_static diff --git a/plugins/genericprojectmanager/tests/CMakeLists.txt b/plugins/genericprojectmanager/tests/CMakeLists.txt --- a/plugins/genericprojectmanager/tests/CMakeLists.txt +++ b/plugins/genericprojectmanager/tests/CMakeLists.txt @@ -1,2 +1,8 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_add_test(test_projectload.cpp LINK_LIBRARIES Qt5::Test KDev::Project KDev::Interfaces KDev::Tests) diff --git a/plugins/ghprovider/CMakeLists.txt b/plugins/ghprovider/CMakeLists.txt --- a/plugins/ghprovider/CMakeLists.txt +++ b/plugins/ghprovider/CMakeLists.txt @@ -1,6 +1,12 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevghprovider\") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + add_subdirectory(icons) set(kdevghprovider_PART_SRCS diff --git a/plugins/git/CMakeLists.txt b/plugins/git/CMakeLists.txt --- a/plugins/git/CMakeLists.txt +++ b/plugins/git/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevgit\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_qt_declare_logging_category(kdevgit_LOG_PART_SRCS HEADER debug.h IDENTIFIER PLUGIN_GIT diff --git a/plugins/git/tests/CMakeLists.txt b/plugins/git/tests/CMakeLists.txt --- a/plugins/git/tests/CMakeLists.txt +++ b/plugins/git/tests/CMakeLists.txt @@ -7,6 +7,13 @@ .. ${CMAKE_CURRENT_BINARY_DIR}/.. ) + + remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY + ) + set(gittest_SRCS test_git.cpp ../gitplugin.cpp diff --git a/plugins/grepview/CMakeLists.txt b/plugins/grepview/CMakeLists.txt --- a/plugins/grepview/CMakeLists.txt +++ b/plugins/grepview/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevgrepview\") -########### next target ############### +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) ecm_qt_declare_logging_category(kdevgrepview_LOG_PART_SRCS HEADER debug.h diff --git a/plugins/grepview/tests/CMakeLists.txt b/plugins/grepview/tests/CMakeLists.txt --- a/plugins/grepview/tests/CMakeLists.txt +++ b/plugins/grepview/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + include_directories( .. ${CMAKE_CURRENT_BINARY_DIR}/.. diff --git a/plugins/kdeprovider/CMakeLists.txt b/plugins/kdeprovider/CMakeLists.txt --- a/plugins/kdeprovider/CMakeLists.txt +++ b/plugins/kdeprovider/CMakeLists.txt @@ -1,4 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevkdeprovider\") + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + if(BUILD_TESTING) add_subdirectory(tests) endif() diff --git a/plugins/kdeprovider/tests/CMakeLists.txt b/plugins/kdeprovider/tests/CMakeLists.txt --- a/plugins/kdeprovider/tests/CMakeLists.txt +++ b/plugins/kdeprovider/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(test_kdeprojectsreader_SRCS ../kdeprojectsreader.cpp ../kdeprojectsmodel.cpp diff --git a/plugins/konsole/CMakeLists.txt b/plugins/konsole/CMakeLists.txt --- a/plugins/konsole/CMakeLists.txt +++ b/plugins/konsole/CMakeLists.txt @@ -1,5 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevkonsole\") -########### next target ############### + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set(kdevkonsoleview_PART_SRCS kdevkonsoleviewplugin.cpp diff --git a/plugins/lldb/CMakeLists.txt b/plugins/lldb/CMakeLists.txt --- a/plugins/lldb/CMakeLists.txt +++ b/plugins/lldb/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevlldb\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevlldb_SRCS lldbdebugger.cpp lldbcommand.cpp diff --git a/plugins/lldb/unittests/CMakeLists.txt b/plugins/lldb/unittests/CMakeLists.txt --- a/plugins/lldb/unittests/CMakeLists.txt +++ b/plugins/lldb/unittests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_add_test(test_lldb.cpp LINK_LIBRARIES kdevlldb_static diff --git a/plugins/makebuilder/CMakeLists.txt b/plugins/makebuilder/CMakeLists.txt --- a/plugins/makebuilder/CMakeLists.txt +++ b/plugins/makebuilder/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevmakebuilder\") -########### next target ############### +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set(kdevmakebuilder_SRCS makebuilder.cpp diff --git a/plugins/manpage/CMakeLists.txt b/plugins/manpage/CMakeLists.txt --- a/plugins/manpage/CMakeLists.txt +++ b/plugins/manpage/CMakeLists.txt @@ -1,4 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevmanpage\") + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevmanpage_SRCS manpagedocumentation.cpp manpageplugin.cpp diff --git a/plugins/manpage/tests/CMakeLists.txt b/plugins/manpage/tests/CMakeLists.txt --- a/plugins/manpage/tests/CMakeLists.txt +++ b/plugins/manpage/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(test_manpagemodel_SRCS test_manpagemodel.cpp ../manpagedocumentation.cpp diff --git a/plugins/ninjabuilder/CMakeLists.txt b/plugins/ninjabuilder/CMakeLists.txt --- a/plugins/ninjabuilder/CMakeLists.txt +++ b/plugins/ninjabuilder/CMakeLists.txt @@ -1,4 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevninja\") + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(kdevninja_SRCS ninjajob.cpp ninjabuilder.cpp ninjabuilderpreferences.cpp) ecm_qt_declare_logging_category(kdevninja_SRCS HEADER debug.h diff --git a/plugins/outlineview/CMakeLists.txt b/plugins/outlineview/CMakeLists.txt --- a/plugins/outlineview/CMakeLists.txt +++ b/plugins/outlineview/CMakeLists.txt @@ -1,11 +1,5 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevoutlineview\") -add_definitions( - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_BYTEARRAY -) - set(kdevoutlineview_SRCS outlineviewplugin.cpp outlinenode.cpp diff --git a/plugins/patchreview/CMakeLists.txt b/plugins/patchreview/CMakeLists.txt --- a/plugins/patchreview/CMakeLists.txt +++ b/plugins/patchreview/CMakeLists.txt @@ -17,6 +17,13 @@ endif() add_definitions(-DTRANSLATION_DOMAIN=\"kdevpatchreview\") + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + kde_enable_exceptions() if(LibKompareDiff2_VERSION VERSION_LESS 5.1) diff --git a/plugins/perforce/CMakeLists.txt b/plugins/perforce/CMakeLists.txt --- a/plugins/perforce/CMakeLists.txt +++ b/plugins/perforce/CMakeLists.txt @@ -1,3 +1,10 @@ +# temporary while patch series in work 08/2018 +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + add_subdirectory(p4clientstub) ecm_qt_declare_logging_category(kdevperforce_LOG_PART_SRCS HEADER debug.h diff --git a/plugins/projectfilter/CMakeLists.txt b/plugins/projectfilter/CMakeLists.txt --- a/plugins/projectfilter/CMakeLists.txt +++ b/plugins/projectfilter/CMakeLists.txt @@ -1,7 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevprojectfilter\") -############################## -# PLUGIN ##################### -############################## + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set( projectfilter_SRCS projectfilterprovider.cpp diff --git a/plugins/projectfilter/tests/CMakeLists.txt b/plugins/projectfilter/tests/CMakeLists.txt --- a/plugins/projectfilter/tests/CMakeLists.txt +++ b/plugins/projectfilter/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(test_projectfilter_SRCS test_projectfilter.cpp ../projectfilter.cpp ../filter.cpp) diff --git a/plugins/projectmanagerview/CMakeLists.txt b/plugins/projectmanagerview/CMakeLists.txt --- a/plugins/projectmanagerview/CMakeLists.txt +++ b/plugins/projectmanagerview/CMakeLists.txt @@ -1,5 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevprojectmanagerview\") -########### next target ############### + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) set(kdevprojectmanagerview_PLUGIN_SRCS projectmanagerviewplugin.cpp diff --git a/plugins/qmakemanager/CMakeLists.txt b/plugins/qmakemanager/CMakeLists.txt --- a/plugins/qmakemanager/CMakeLists.txt +++ b/plugins/qmakemanager/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevqmakemanager\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_qt_declare_logging_category(qmakecommon_LOG_SRCS HEADER debug.h IDENTIFIER KDEV_QMAKE diff --git a/plugins/qmakemanager/parser/tests/CMakeLists.txt b/plugins/qmakemanager/parser/tests/CMakeLists.txt --- a/plugins/qmakemanager/parser/tests/CMakeLists.txt +++ b/plugins/qmakemanager/parser/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_add_test(parsetest.cpp ${qmakecommon_LOG_SRCS} TEST_NAME test_qmakeparse LINK_LIBRARIES diff --git a/plugins/qmakemanager/tests/CMakeLists.txt b/plugins/qmakemanager/tests/CMakeLists.txt --- a/plugins/qmakemanager/tests/CMakeLists.txt +++ b/plugins/qmakemanager/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + set(QMAKE_TESTS_PROJECTS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/manual") set(QMAKE_TESTS_PROJECTS_DIR "${CMAKE_CURRENT_BINARY_DIR}/manual") file(COPY ${QMAKE_TESTS_PROJECTS_SOURCE_DIR} DESTINATION "${QMAKE_TESTS_PROJECTS_DIR}/..") diff --git a/plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt b/plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt --- a/plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt +++ b/plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + qt5_wrap_ui(uifiles_SRCS utils/projectintropage.ui utils/filewizardpage.ui diff --git a/plugins/qmljs/CMakeLists.txt b/plugins/qmljs/CMakeLists.txt --- a/plugins/qmljs/CMakeLists.txt +++ b/plugins/qmljs/CMakeLists.txt @@ -1,4 +1,11 @@ add_subdirectory(3rdparty/qtcreator-libs) + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + add_subdirectory(duchain) add_subdirectory(nodejsmodules) if(BUILD_TESTING) diff --git a/plugins/qmljs/codecompletion/tests/CMakeLists.txt b/plugins/qmljs/codecompletion/tests/CMakeLists.txt --- a/plugins/qmljs/codecompletion/tests/CMakeLists.txt +++ b/plugins/qmljs/codecompletion/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_add_test(test_qmljscompletion.cpp LINK_LIBRARIES Qt5::Test diff --git a/plugins/qmljs/duchain/tests/CMakeLists.txt b/plugins/qmljs/duchain/tests/CMakeLists.txt --- a/plugins/qmljs/duchain/tests/CMakeLists.txt +++ b/plugins/qmljs/duchain/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_add_test(test_qmljscontexts.cpp LINK_LIBRARIES Qt5::Test diff --git a/plugins/qmljs/tests/CMakeLists.txt b/plugins/qmljs/tests/CMakeLists.txt --- a/plugins/qmljs/tests/CMakeLists.txt +++ b/plugins/qmljs/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + add_executable(qml-parser qml-parser.cpp ) diff --git a/plugins/qthelp/CMakeLists.txt b/plugins/qthelp/CMakeLists.txt --- a/plugins/qthelp/CMakeLists.txt +++ b/plugins/qthelp/CMakeLists.txt @@ -1,5 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevqthelp\") +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_qt_declare_logging_category(kdevqthelp_LOG_SRCS HEADER debug.h IDENTIFIER QTHELP diff --git a/plugins/qthelp/tests/CMakeLists.txt b/plugins/qthelp/tests/CMakeLists.txt --- a/plugins/qthelp/tests/CMakeLists.txt +++ b/plugins/qthelp/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/..) configure_file(testqthelpconfig.h.in testqthelpconfig.h) diff --git a/plugins/quickopen/CMakeLists.txt b/plugins/quickopen/CMakeLists.txt --- a/plugins/quickopen/CMakeLists.txt +++ b/plugins/quickopen/CMakeLists.txt @@ -1,4 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevquickopen\") + +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + if(BUILD_TESTING) add_subdirectory( tests ) endif() diff --git a/plugins/quickopen/tests/CMakeLists.txt b/plugins/quickopen/tests/CMakeLists.txt --- a/plugins/quickopen/tests/CMakeLists.txt +++ b/plugins/quickopen/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + add_library(quickopentestbase STATIC quickopentestbase.cpp ../projectfilequickopen.cpp) diff --git a/plugins/subversion/CMakeLists.txt b/plugins/subversion/CMakeLists.txt --- a/plugins/subversion/CMakeLists.txt +++ b/plugins/subversion/CMakeLists.txt @@ -5,6 +5,12 @@ # but for now, we won't spend time on it... add_definitions(-DSVN_DEPRECATED=) +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + kde_enable_exceptions() if(BUILD_TESTING) diff --git a/plugins/subversion/tests/CMakeLists.txt b/plugins/subversion/tests/CMakeLists.txt --- a/plugins/subversion/tests/CMakeLists.txt +++ b/plugins/subversion/tests/CMakeLists.txt @@ -1,3 +1,9 @@ +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +) + ecm_add_test(test_svnrecursiveadd.cpp LINK_LIBRARIES Qt5::Test Qt5::Gui KDev::Tests KDev::Util KDev::Vcs