From 58654c134e2e66ee736a607cdcbec92a06ddeb59 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 13 Mar 2016 15:45:28 +0200 Subject: [PATCH] GenericHighlighter: Update from latest KTextEditor source Change-Id: I84b783df1eaca9e162e50f23e1da8fa0afa9666d Reviewed-by: David Schulz --- share/qtcreator/generic-highlighter/bash.xml | 12 +- share/qtcreator/generic-highlighter/cmake.xml | 402 +++++++++++++++--- share/qtcreator/generic-highlighter/css.xml | 23 +- .../qtcreator/generic-highlighter/doxygen.xml | 16 +- share/qtcreator/generic-highlighter/java.xml | 32 +- share/qtcreator/generic-highlighter/perl.xml | 4 +- share/qtcreator/generic-highlighter/xml.xml | 2 +- 7 files changed, 380 insertions(+), 111 deletions(-) diff --git a/share/qtcreator/generic-highlighter/bash.xml b/share/qtcreator/generic-highlighter/bash.xml index a07de3999aa..2eaec955e03 100644 --- a/share/qtcreator/generic-highlighter/bash.xml +++ b/share/qtcreator/generic-highlighter/bash.xml @@ -8,7 +8,7 @@ ]> - + - + cmake_minimum_required cmake_policy configure_file + continue create_test_sourcelist + ctest_build + ctest_configure + ctest_coverage + ctest_empty_binary_directory + ctest_memcheck + ctest_read_custom_files + ctest_run_script + ctest_sleep + ctest_start + ctest_submit + ctest_test + ctest_update + ctest_upload define_property else elseif @@ -130,9 +144,11 @@ subdir_depends subdirs target_compile_definitions + target_compile_features target_compile_options target_include_directories target_link_libraries + target_sources try_compile try_run unset @@ -161,6 +177,7 @@ ALPHABET AND APPEND + APPENDNUMBER_ERRORS APPEND_STRING ARCHIVE ARGS @@ -168,9 +185,13 @@ AUTHOR_WARNING BEFORE BRIEF_DOCS + BUILD BUNDLE + BYPRODUCTS CACHE CACHED_VARIABLE + CDASH_UPLOAD + CDASH_UPLOAD_TYPE CLEAR CMAKE_FIND_ROOT_PATH_BOTH CMAKE_FLAGS @@ -184,6 +205,7 @@ COMPILE_RESULT_VAR COMPONENT COMPONENTS + CONCAT CONDITION CONFIG CONFIGS @@ -206,6 +228,7 @@ DOS DOWNLOAD ENV + END EQUAL ERROR_FILE ERROR_QUIET @@ -215,6 +238,7 @@ EXACT EXCLUDE EXCLUDE_FROM_ALL + EXCLUDE_LABEL EXISTS EXPECTED_HASH EXPECTED_MD5 @@ -228,12 +252,14 @@ FILES_MATCHING FILE_PERMISSIONS FIND + FLAGS FOLLOW_SYMLINKS FORCE FRAMEWORK FULL_DOCS FUNCTION GENERATE + GENEX_STRIP GET GLOB GLOBAL @@ -241,6 +267,7 @@ GREATER GROUP_EXECUTE GROUP_READ + GUARD GUID HEX HINTS @@ -248,8 +275,10 @@ IMPORTED IN INACTIVITY_TIMEOUT + INCLUDE INCLUDES INCLUDE_INTERNALS + INCLUDE_LABEL INHERITED INPUT INPUT_FILE @@ -261,6 +290,8 @@ IS_NEWER_THAN IS_SYMLINK ITEMS + LABELS + LANGUAGES LENGTH LENGTH_MAXIMUM LENGTH_MINIMUM @@ -276,6 +307,8 @@ LINK_PRIVATE LINK_PUBLIC LISTS + LIST_DIRECTORIES + LOCK LOG MACOSX_BUNDLE MAIN_DEPENDENCY @@ -285,6 +318,7 @@ MATCHALL MATCHES MD5 + MESSAGE_NEVER MODULE NAME NAMELINK_ONLY @@ -295,6 +329,7 @@ NEW NEWLINE_CONSUME NEWLINE_STYLE + NEW_PROCESS NOT NOTEQUAL NO_CMAKE_BUILDS_PATH @@ -310,12 +345,17 @@ NO_POLICY_SCOPE NO_SOURCE_PERMISSIONS NO_SYSTEM_ENVIRONMENT_PATH + NUMBER_ERRORS + NUMBER_WARNINGS OBJECT + OFF OFFSET OLD + ON ONLY_CMAKE_FIND_ROOT_PATH OPTIONAL OPTIONAL_COMPONENTS + OPTIONS OR OUTPUT OUTPUT_DIRECTORY @@ -327,7 +367,9 @@ OWNER_READ OWNER_WRITE PACKAGE + PARALLEL_LEVEL PARENT_SCOPE + PARTS PATHS PATH_SUFFIXES PATH_TO_MESA @@ -342,6 +384,7 @@ PRE_LINK PRIVATE PRIVATE_HEADER + PROCESS PROGRAM PROGRAMS PROGRAM_ARGS @@ -362,6 +405,7 @@ REGULAR_EXPRESSION RELATIVE RELATIVE_PATH + RELEASE REMOVE REMOVE_AT REMOVE_DUPLICATES @@ -376,12 +420,15 @@ RESULT RESULT_VAR RESULT_VARIABLE + RETRY_COUNT + RETRY_DELAY RETURN_VALUE REVERSE RUNTIME RUNTIME_DIRECTORY RUN_OUTPUT_VARIABLE RUN_RESULT_VAR + SCHEDULE_RANDOM SCRIPT SEND_ERROR SET @@ -395,10 +442,13 @@ SORT SOURCE SOURCES + START STATIC STATUS STREQUAL STRGREATER + STOP_TIME + STRIDE STRINGS STRIP STRLESS @@ -416,13 +466,17 @@ TOUPPER TO_CMAKE_PATH TO_NATIVE_PATH + TRACK TYPE UNIX UNIX_COMMAND UNKNOWN UPLOAD + UPPER + USES_TERMINAL USE_SOURCE_PERMISSIONS UTC + UUID VALUE VARIABLE VERBATIM @@ -461,6 +515,8 @@ AVAILABLE_VIRTUAL_MEMORY TOTAL_PHYSICAL_MEMORY AVAILABLE_PHYSICAL_MEMORY + + IN_LIST @@ -471,30 +527,61 @@ ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS + ANDROID_API + ANDROID_API_MIN + ANDROID_GUI ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_NAME ATTACHED_FILES ATTACHED_FILES_ON_FAIL + AUTOGEN_TARGETS_FOLDER + AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER + AUTORCC + AUTORCC_OPTIONS + AUTOUIC + AUTOUIC_OPTIONS BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM + CMAKE_CONFIGURE_DEPENDS + CMAKE_CXX_KNOWN_FEATURES + CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL + COMPATIBLE_INTERFACE_NUMBER_MAX + COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS + COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS + COMPILE_PDB_NAME + COMPILE_PDB_OUTPUT_DIRECTORY COST + CPACK_DESKTOP_SHORTCUTS + CPACK_NEVER_OVERWRITE + CPACK_PERMANENT + CPACK_STARTUP_SHORTCUTS + CPACK_START_MENU_SHORTCUTS + CPACK_WIX_ACL + CROSSCOMPILING_EMULATOR + CXX_EXTENSIONS + CXX_STANDARD + CXX_STANDARD_REQUIRED + C_EXTENSIONS + C_STANDARD + C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES + ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS @@ -537,14 +624,20 @@ INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH + INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS + INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE + INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION IN_TRY_COMPILE + JOB_POOLS + JOB_POOL_COMPILE + JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE @@ -572,6 +665,7 @@ MODIFIED NAME NO_SONAME + NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES @@ -603,6 +697,7 @@ RUNTIME_OUTPUT_NAME RUN_SERIAL SKIP_BUILD_RPATH + SKIP_RETURN_CODE SOURCES SOVERSION STATIC_LIBRARY_FLAGS @@ -619,6 +714,8 @@ VARIABLES VERSION VISIBILITY_INLINES_HIDDEN + VS_DEPLOYMENT_CONTENT + VS_DEPLOYMENT_LOCATION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD @@ -629,13 +726,21 @@ VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER + VS_SHADER_ENTRYPOINT + VS_SHADER_FLAGS + VS_SHADER_MODEL + VS_SHADER_TYPE + VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES + VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WORKING_DIRECTORY WRAP_EXCLUDE - __CMAKE_DELETE_CACHE_CHANGE_VARS_ + XCODE_EXPLICIT_FILE_TYPE + XCODE_LAST_KNOWN_FILE_TYPE + XCTEST @@ -651,6 +756,10 @@ BORLAND BUILD_SHARED_LIBS CMAKE_ABSOLUTE_DESTINATION_FILES + CMAKE_ANDROID_API + CMAKE_ANDROID_API_MIN + CMAKE_ANDROID_GUI + CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARGC @@ -658,6 +767,10 @@ CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE + CMAKE_AUTORCC + CMAKE_AUTORCC_OPTIONS + CMAKE_AUTOUIC + CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL @@ -672,14 +785,24 @@ CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 + CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING + CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR + CMAKE_CXX_COMPILE_FEATURES + CMAKE_CXX_EXTENSIONS + CMAKE_CXX_STANDARD + CMAKE_CXX_STANDARD_REQUIRED + CMAKE_C_COMPILE_FEATURES + CMAKE_C_EXTENSIONS + CMAKE_C_STANDARD + CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DL_LIBS @@ -688,17 +811,29 @@ CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS + CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES + CMAKE_FIND_NO_INSTALL_PREFIX + CMAKE_FIND_PACKAGE_NAME + CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY + CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE + CMAKE_FIND_ROOT_PATH + CMAKE_FIND_ROOT_PATH_MODE_INCLUDE + CMAKE_FIND_ROOT_PATH_MODE_LIBRARY + CMAKE_FIND_ROOT_PATH_MODE_PACKAGE + CMAKE_FIND_ROOT_PATH_MODE_PROGRAM + CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR + CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY @@ -714,27 +849,34 @@ CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE + CMAKE_INCLUDE_DIRECTORIES_BEFORE + CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME + CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI + CMAKE_JOB_POOL_COMPILE + CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG - CMAKE_LINK_DEF_FILE_FLAG + CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_MACOSX_BUNDLE + CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM + CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION @@ -742,7 +884,11 @@ CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH + CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX + CMAKE_OSX_ARCHITECTURES + CMAKE_OSX_DEPLOYMENT_TARGET + CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY @@ -763,12 +909,15 @@ CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH + CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR + CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS + CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH @@ -778,6 +927,7 @@ CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION + CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE @@ -785,19 +935,84 @@ CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN + CMAKE_VS_DEVENV_COMMAND + CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD + CMAKE_VS_INTEL_Fortran_PROJECT_VERSION + CMAKE_VS_MSBUILD_COMMAND + CMAKE_VS_MSDEV_COMMAND + CMAKE_VS_NsightTegra_VERSION + CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_XCODE_PLATFORM_TOOLSET + CPACK_ABSOLUTE_DESTINATION_FILES + CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY + CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION + CPACK_INCLUDE_TOPLEVEL_DIRECTORY + CPACK_INSTALL_SCRIPT + CPACK_PACKAGING_INSTALL_PREFIX + CPACK_SET_DESTDIR + CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION + CTEST_BINARY_DIRECTORY + CTEST_BUILD_COMMAND + CTEST_BUILD_NAME + CTEST_BZR_COMMAND + CTEST_BZR_UPDATE_OPTIONS + CTEST_CHECKOUT_COMMAND + CTEST_CONFIGURATION_TYPE + CTEST_CONFIGURE_COMMAND + CTEST_COVERAGE_COMMAND + CTEST_COVERAGE_EXTRA_FLAGS + CTEST_CURL_OPTIONS + CTEST_CVS_CHECKOUT + CTEST_CVS_COMMAND + CTEST_CVS_UPDATE_OPTIONS + CTEST_DROP_LOCATION + CTEST_DROP_METHOD + CTEST_DROP_SITE + CTEST_DROP_SITE_CDASH + CTEST_DROP_SITE_PASSWORD + CTEST_DROP_SITE_USER + CTEST_GIT_COMMAND + CTEST_GIT_UPDATE_CUSTOM + CTEST_GIT_UPDATE_OPTIONS + CTEST_HG_COMMAND + CTEST_HG_UPDATE_OPTIONS + CTEST_MEMORYCHECK_COMMAND + CTEST_MEMORYCHECK_COMMAND_OPTIONS + CTEST_MEMORYCHECK_SANITIZER_OPTIONS + CTEST_MEMORYCHECK_SUPPRESSIONS_FILE + CTEST_MEMORYCHECK_TYPE + CTEST_NIGHTLY_START_TIME + CTEST_P4_CLIENT + CTEST_P4_COMMAND + CTEST_P4_OPTIONS + CTEST_P4_UPDATE_OPTIONS + CTEST_SCP_COMMAND + CTEST_SITE + CTEST_SOURCE_DIRECTORY + CTEST_SVN_COMMAND + CTEST_SVN_OPTIONS + CTEST_SVN_UPDATE_OPTIONS + CTEST_TEST_TIMEOUT + CTEST_TRIGGER_SITE + CTEST_UPDATE_COMMAND + CTEST_UPDATE_OPTIONS + CTEST_UPDATE_VERSION_ONLY + CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH + GHS-MULTI LIBRARY_OUTPUT_PATH + MINGW MSVC MSVC10 MSVC11 MSVC12 + MSVC14 MSVC60 MSVC70 MSVC71 @@ -808,8 +1023,16 @@ PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR + PROJECT_VERSION + PROJECT_VERSION_MAJOR + PROJECT_VERSION_MINOR + PROJECT_VERSION_PATCH + PROJECT_VERSION_TWEAK UNIX WIN32 + WINCE + WINDOWS_PHONE + WINDOWS_STORE XCODE_VERSION @@ -822,15 +1045,17 @@ + 0 1 - CONFIG BOOL + AND + OR + NOT STREQUAL - JOIN - TARGET_NAME - INSTALL_INTERFACE - BUILD_INTERFACE + EQUAL + CONFIG + PLATFORM_ID C_COMPILER_ID CXX_COMPILER_ID VERSION_GREATER @@ -838,22 +1063,39 @@ VERSION_EQUAL C_COMPILER_VERSION CXX_COMPILER_VERSION - TARGET_FILE - TARGET_LINKER_FILE - TARGET_SONAME_FILE - TARGET_FILE_DIR - TARGET_FILE_NAME - TARGET_DIR - TARGET_LINKER_FILE_DIR - TARGET_LINKER_FILE_NAME - TARGET_SONAME_FILE_DIR - TARGET_SONAME_FILE_NAME - TARGET_PROPERTY - TARGET_OBJECTS TARGET_POLICY - AND - OR - NOT + COMPILER_FEATURES + + CONFIGURATION + TARGET_FILE + TARGET_FILE_NAME + TARGET_FILE_DIR + TARGET_LINKER_FILE + TARGET_LINKER_FILE_NAME + TARGET_LINKER_FILE_DIR + TARGET_SONAME_FILE + TARGET_SONAME_FILE_NAME + TARGET_SONAME_FILE_DIR + TARGET_PDB_FILE + TARGET_PDB_FILE_NAME + TARGET_PDB_FILE_DIR + TARGET_PROPERTY + INSTALL_PREFIX + + JOIN + ANGLE-R + COMMA + SEMICOLON + TARGET_NAME + LINK_ONLY + INSTALL_INTERFACE + BUILD_INTERFACE + LOWER_CASE + UPPER_CASE + MAKE_C_IDENTIFIER + TARGET_OBJECTS + + TARGET_DIR @@ -878,34 +1120,45 @@ - - - - + + + + - - - + + + + + + + + + + + + + + @@ -916,68 +1169,82 @@ + + + + + - + + + + + + + + + + - + - + - - + + - + - + - - - - - + + + + + - - + + - - - - + + + + - - - + + + - - - - + + + + @@ -995,26 +1262,26 @@ - - + + - + - + - - + + - + @@ -1022,12 +1289,13 @@ + - + - + diff --git a/share/qtcreator/generic-highlighter/css.xml b/share/qtcreator/generic-highlighter/css.xml index fb2ac320f82..552b259a92e 100644 --- a/share/qtcreator/generic-highlighter/css.xml +++ b/share/qtcreator/generic-highlighter/css.xml @@ -19,11 +19,11 @@ Changelog: - Make it spelling aware - Version 2.08, Joseph Wenninger: -- CSS3 media queries +- CSS3 media queries --> - + @@ -214,6 +214,7 @@ Changelog: transition transition-property transition-duration + word-break word-wrap @@ -639,7 +640,7 @@ Changelog: not only - + width min-width @@ -675,7 +676,7 @@ Changelog: scan grid - + hover link @@ -761,16 +762,16 @@ Changelog: - + - + - + @@ -779,14 +780,14 @@ Changelog: - + - + @@ -794,7 +795,7 @@ Changelog: - + @@ -901,7 +902,7 @@ Changelog: - + diff --git a/share/qtcreator/generic-highlighter/doxygen.xml b/share/qtcreator/generic-highlighter/doxygen.xml index abdf3c675fc..5128903e919 100644 --- a/share/qtcreator/generic-highlighter/doxygen.xml +++ b/share/qtcreator/generic-highlighter/doxygen.xml @@ -29,8 +29,8 @@ --> - + - + @@ -501,10 +501,10 @@ - - - - + + + + diff --git a/share/qtcreator/generic-highlighter/java.xml b/share/qtcreator/generic-highlighter/java.xml index 02534508e28..e06ec6bd864 100644 --- a/share/qtcreator/generic-highlighter/java.xml +++ b/share/qtcreator/generic-highlighter/java.xml @@ -1,6 +1,6 @@ - + ACTIVE @@ -3828,24 +3828,24 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + diff --git a/share/qtcreator/generic-highlighter/perl.xml b/share/qtcreator/generic-highlighter/perl.xml index ba286327024..2f6e823bfb6 100644 --- a/share/qtcreator/generic-highlighter/perl.xml +++ b/share/qtcreator/generic-highlighter/perl.xml @@ -39,7 +39,7 @@ Enhance tr/// and y/// support. --> - + if @@ -658,7 +658,7 @@ - + diff --git a/share/qtcreator/generic-highlighter/xml.xml b/share/qtcreator/generic-highlighter/xml.xml index 6bf68177513..3d92a563cd1 100644 --- a/share/qtcreator/generic-highlighter/xml.xml +++ b/share/qtcreator/generic-highlighter/xml.xml @@ -134,7 +134,7 @@ - +