diff options
| -rwxr-xr-x | find-modules/rules_engine.py | 2 | ||||
| -rw-r--r-- | find-modules/sip_generator.py | 2 | ||||
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 6 | ||||
| -rw-r--r-- | kde-modules/clang-format.cmake | 2 | ||||
| -rw-r--r-- | modules/ECMConfiguredInstall.cmake | 2 | ||||
| -rw-r--r-- | modules/ECMFindModuleHelpers.cmake | 2 | ||||
| -rw-r--r-- | modules/ECMGenerateExportHeader.cmake | 4 | ||||
| -rw-r--r-- | modules/ECMQchDoxygen.config.in | 2 | ||||
| -rw-r--r-- | tests/ECMCheckOutboundLicenseTest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/ECMGenerateExportHeaderTest/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | toolchain/generate-fastlane-metadata.py | 2 |
11 files changed, 14 insertions, 14 deletions
diff --git a/find-modules/rules_engine.py b/find-modules/rules_engine.py index b9e9dedd..a2781cb9 100755 --- a/find-modules/rules_engine.py +++ b/find-modules/rules_engine.py @@ -812,7 +812,7 @@ class RuleSet(object): """ To implement your own binding, create a subclass of RuleSet, also called RuleSet in your own Python module. Your subclass will expose the raw rules - along with other ancilliary data exposed through the subclass methods. + along with other ancillary data exposed through the subclass methods. You then simply run the SIP generation and SIP compilation programs passing in the name of your rules file diff --git a/find-modules/sip_generator.py b/find-modules/sip_generator.py index b8418649..548d798b 100644 --- a/find-modules/sip_generator.py +++ b/find-modules/sip_generator.py @@ -286,7 +286,7 @@ class SipGenerator(object): pass elif is_copy_constructor(member) or is_default_constructor(member): # - # ...we need to pass private copy contructors to the SIP compiler. + # ...we need to pass private copy constructors to the SIP compiler. # pass else: diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index ce20fdf7..ead3b31b 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -26,7 +26,7 @@ Since 5.85 newer settings are controlled by a variable ``KDE_COMPILERSETTINGS_LEVEL``, taking an ECM version as value. That version can not be greater than the minimum required ECM version. The settings which are default at that version will then be used, -but can be overriden by more fine-grained controls (see respective settings). +but can be overridden by more fine-grained controls (see respective settings). This variable needs to be set before including this module, otherwise defaults to the minimum required ECM version. @@ -48,7 +48,7 @@ Otherwise: - ``CMAKE_C_EXTENSIONS``: not modified If the variable ``CMAKE_C_STANDARD`` is already set when including this module, -none of the above variables will be modifed. +none of the above variables will be modified. The following CMake C++ standard default variables are set: @@ -65,7 +65,7 @@ Otherwise: - ``CMAKE_CXX_EXTENSIONS``: not modified. If the variable ``CMAKE_CXX_STANDARD`` is already set when including this module, -none of the above variables will be modifed. +none of the above variables will be modified. The following C++ compiler flags are set: diff --git a/kde-modules/clang-format.cmake b/kde-modules/clang-format.cmake index 48e442fa..91b51c85 100644 --- a/kde-modules/clang-format.cmake +++ b/kde-modules/clang-format.cmake @@ -56,7 +56,7 @@ BinPackArguments: false # don't move parameters to own lines if they are not all on the same BinPackParameters: false -# In case we have an if statement whith multiple lines the operator should be at the beginning of the line +# In case we have an if statement with multiple lines the operator should be at the beginning of the line # but we do not want to break assignments BreakBeforeBinaryOperators: NonAssignment diff --git a/modules/ECMConfiguredInstall.cmake b/modules/ECMConfiguredInstall.cmake index e3e77312..9a6f5ce6 100644 --- a/modules/ECMConfiguredInstall.cmake +++ b/modules/ECMConfiguredInstall.cmake @@ -8,7 +8,7 @@ ECMConfiguredInstall Takes a list of files, runs configure_file on each and installs the resultant configured files in the given location. -Any suffix of ".in" in the passed file names wil be stripped from the file name at the installed location. +Any suffix of ".in" in the passed file names will be stripped from the file name at the installed location. :: diff --git a/modules/ECMFindModuleHelpers.cmake b/modules/ECMFindModuleHelpers.cmake index aec2abb4..ce873b4b 100644 --- a/modules/ECMFindModuleHelpers.cmake +++ b/modules/ECMFindModuleHelpers.cmake @@ -72,7 +72,7 @@ for each component. If SKIP_DEPENDENCY_HANDLING is not set, the INTERFACE_LINK_LIBRARIES property of the imported target for <component> will be set to contain the imported targets for the components listed in <name>_<component>_component_deps. -<component>_FOUND will also be set to false if any of the compoments in +<component>_FOUND will also be set to false if any of the components in <name>_<component>_component_deps are not found. This requires the components in <name>_<component>_component_deps to be listed before <component> in the COMPONENTS argument. diff --git a/modules/ECMGenerateExportHeader.cmake b/modules/ECMGenerateExportHeader.cmake index 7b05e6fc..e8e1fb16 100644 --- a/modules/ECMGenerateExportHeader.cmake +++ b/modules/ECMGenerateExportHeader.cmake @@ -534,7 +534,7 @@ function(ecm_generate_export_header target) endif() set_property(TARGET ${target} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS "${ARGS_EXPORT_FILE_NAME}") - # build with all the API not excluded, ensure all deprecated API is visible in the build itselt + # build with all the API not excluded, ensure all deprecated API is visible in the build itself _ecm_geh_generate_hex_number(_hexnumber ${ARGS_EXCLUDE_DEPRECATED_BEFORE_AND_AT}) set(_disabling_visibility_definition "${_macro_base_name}_DISABLE_DEPRECATED_BEFORE_AND_AT=${_hexnumber}") target_compile_definitions(${target} PRIVATE "${_disabling_visibility_definition}") @@ -763,7 +763,7 @@ function(ecm_generate_export_header target) if (ARGS_STATIC_DEFINE) set(_static_define_args STATIC_DEFINE "${ARGS_STATIC_DEFINE}") endif() - # for older cmake verions we have to manually append our generated content + # for older cmake versions we have to manually append our generated content # for newer we use CUSTOM_CONTENT_FROM_VARIABLE set(_custom_content_args) set(_custom_content_args CUSTOM_CONTENT_FROM_VARIABLE _output) diff --git a/modules/ECMQchDoxygen.config.in b/modules/ECMQchDoxygen.config.in index f336d9f6..917964ae 100644 --- a/modules/ECMQchDoxygen.config.in +++ b/modules/ECMQchDoxygen.config.in @@ -26,7 +26,7 @@ FULL_PATH_NAMES = NO STRIP_FROM_PATH = STRIP_FROM_INC_PATH = SHORT_NAMES = NO -# Do not require explicity @brief command for brief description +# Do not require explicitly @brief command for brief description JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO INHERIT_DOCS = YES diff --git a/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt b/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt index 454e7991..5a4e1bde 100644 --- a/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt +++ b/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt @@ -15,7 +15,7 @@ FILES ${CMAKE_CURRENT_SOURCE_DIR}/testdata/LGPL-2.1-or-later.cpp ) -# check test case generation wihout TEST_NAME statement +# check test case generation without TEST_NAME statement ecm_check_outbound_license( LICENSES LGPL-2.1-only FILES diff --git a/tests/ECMGenerateExportHeaderTest/CMakeLists.txt b/tests/ECMGenerateExportHeaderTest/CMakeLists.txt index 45ad611e..c9635e34 100644 --- a/tests/ECMGenerateExportHeaderTest/CMakeLists.txt +++ b/tests/ECMGenerateExportHeaderTest/CMakeLists.txt @@ -83,7 +83,7 @@ list(LENGTH library_versions library_versions_count) math(EXPR _last_index ${library_versions_count}-1) # test generating the library with different EXCLUDE_DEPRECATED_BEFORE_AND_AT values -# als install the generated libraries together incl. exported cmake targets, for use in tests below +# also install the generated libraries together incl. exported cmake targets, for use in tests below # TODO: wariant with DEPRECATED_BASE_VERSION foreach(_group_arg "" "WITH_GROUP") foreach(_index RANGE ${_last_index}) diff --git a/toolchain/generate-fastlane-metadata.py b/toolchain/generate-fastlane-metadata.py index 699806a9..f39acc3a 100755 --- a/toolchain/generate-fastlane-metadata.py +++ b/toolchain/generate-fastlane-metadata.py @@ -166,7 +166,7 @@ def createYml(appname, data): else: info['Categories'] = ['KDE'] - # Update the general sumamry as well + # Update the general summary as well info['Summary'] = data['summary'][None] # Check to see if we have a Homepage... |