From 2c81fe7302a84a3041be233b27cc9eafbfa412c9 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 10 Mar 2021 09:09:14 +0100 Subject: [PATCH 1/4] Highlighter: readd autoconf highlighter It isn't in the public repository of the syntax files, but it still seems to work. Amends: 14834e6b0a4e7c1272ec3a1838b0634dd66e72ea Fixes: QTCREATORBUG-25391 Change-Id: I23819bdc79c5b4fab92b1150ed102f742a204e89 Reviewed-by: Christian Stenger Reviewed-by: David Schulz Reviewed-by: Eike Ziller --- .../data/syntax/autoconf.xml | 396 ++++++++++++++++++ 1 file changed, 396 insertions(+) create mode 100644 src/libs/3rdparty/syntax-highlighting/data/syntax/autoconf.xml diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/autoconf.xml b/src/libs/3rdparty/syntax-highlighting/data/syntax/autoconf.xml new file mode 100644 index 00000000000..c8a5ca2e6b0 --- /dev/null +++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/autoconf.xml @@ -0,0 +1,396 @@ + + + + + + + + if + then + elif + else + fi + for + in + do + don + function + select + until + while + set + ifelse + case + esac + + + + + : + source + alias + bg + bind + break + builtin + cd + caller + command + compgen + complete + continue + dirs + disown + echo + enable + eval + exec + exit + fc + fg + getopts + hash + help + history + jobs + kill + let + logout + popd + printf + pushd + pwd + return + set + shift + shopt + suspend + test + time + times + trap + type + ulimit + umask + unalias + wait + + + + no + yes + false + true + + + + + AS_BOURNE_COMPATIBLE + AS_BOX + AS_CASE + AS_DIRNAME + AS_ECHO + AS_ECHO_N + AS_ESCAPE + AS_EXIT + AS_HELP_STRING + AS_IF + AS_INIT + AS_INIT_GENERATED + AS_LINENO_PREPARE + AS_LITERAL_IF + AS_LITERAL_WORD_IF + AS_ME_PREPARE + AS_MESSAGE_FD + AS_MESSAGE_LOG_FD + AS_MKDIR_P + AS_ORIGINAL_STDIN_FD + AS_SET_CATFILE + AS_SET_STATUS + AS_SHELL_SANITIZE + AS_TMPDIR + AS_TR_CPP + AS_TR_SH + AS_UNSET + AS_VAR_APPEND + AS_VAR_ARITH + AS_VAR_COPY + AS_VAR_IF + AS_VAR_POPDEF + AS_VAR_PUSHDEF + AS_VAR_SET + AS_VAR_SET_IF + AS_VAR_TEST_SET + AS_VERSION_COMPARE + m4_append + m4_append_uniq + m4_append_uniq_w + m4_apply + m4_argn + m4_assert + m4_bmatch + m4_bpatsubst + m4_bpatsubsts + m4_bregexp + m4_builtin + m4_car + m4_case + m4_cdr + m4_changecom + m4_changequote + m4_chomp + m4_chomp_all + m4_cleardivert + m4_cmp + m4_combine + m4_cond + m4_copy + m4_copy_force + m4_count + m4_curry + m4_debugfile + m4_debugmode + m4_decr + m4_default + m4_default_nblank + m4_default_nblank_quoted + m4_default_quoted + m4_define + m4_define_default + m4_defn + m4_divert + m4_divert_once + m4_divert_pop + m4_divert_push + m4_divert_text + m4_divnum + m4_do + m4_dquote + m4_dquote_elt + m4_dumpdef + m4_dumpdefs + m4_echo + m4_errprint + m4_errprintn + m4_escape + m4_esyscmd + m4_esyscmd_s + m4_eval + m4_exit + m4_expand + m4_fatal + m4_flatten + m4_for + m4_foreach + m4_foreach_w + m4_format + m4_if + m4_ifblank + m4_ifdef + m4_ifnblank + m4_ifndef + m4_ifset + m4_ifval + m4_ifvaln + m4_ignore + m4_include + m4_incr + m4_index + m4_indir + m4_init + m4_join + m4_joinall + m4_len + m4_list_cmp + m4_location + m4_make_list + m4_maketemp + m4_map + m4_map_args + m4_map_args_pair + m4_map_args_sep + m4_map_args_w + m4_map_sep + m4_mapall + m4_mapall_sep + m4_max + m4_min + m4_mkstemp + m4_n + m4_newline + m4_normalize + m4_pattern_allow + m4_pattern_forbid + m4_popdef + m4_pushdef + m4_quote + m4_re_escape + m4_rename + m4_rename_force + m4_reverse + m4_set_add + m4_set_add_all + m4_set_contains + m4_set_contents + m4_set_delete + m4_set_difference + m4_set_dump + m4_set_empty + m4_set_foreach + m4_set_intersection + m4_set_list + m4_set_listc + m4_set_map + m4_set_map_sep + m4_set_remove + m4_set_size + m4_set_union + m4_shift + m4_shift2 + m4_shift3 + m4_shiftn + m4_sign + m4_sinclude + m4_split + m4_stack_foreach + m4_stack_foreach_lifo + m4_stack_foreach_sep + m4_stack_foreach_sep_lifo + m4_strip + m4_substr + m4_syscmd + m4_sysval + m4_text_box + m4_text_wrap + m4_tolower + m4_toupper + m4_traceoff + m4_traceon + m4_translit + m4_undefine + m4_undivert + m4_unquote + m4_version_compare + m4_version_prereq + m4_warn + m4_wrap + m4_wrap_lifo + + + + + AT_ARG_OPTION + AT_ARG_OPTION_ARG + AT_BANNER + AT_CAPTURE_FILE + AT_CHECK + AT_CHECK_EUNIT + AT_CHECK_UNQUOTED + AT_CLEANUP + AT_COLOR_TESTS + AT_COPYRIGHT + AT_DATA + AT_FAIL_IF + AT_INIT + AT_KEYWORDS + AT_PACKAGE_BUGREPORT + AT_PACKAGE_NAME + AT_PACKAGE_STRING + AT_PACKAGE_TARNAME + AT_PACKAGE_URL + AT_PACKAGE_VERSION + AT_SETUP + AT_SKIP_IF + AT_TESTED + AT_XFAIL_IF + + + + LT_PREREQ + LT_LANG + LT_INIT + LTDL_INIT + LT_CONFIG_LTDL_DIR + + + + PKG_CHECK_MODULES + PKG_PROG_PKG_CONFIG + PKG_CHECK_EXISTS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2d318780cd83ea6d942235ffdd0ce30af3c47fef Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Thu, 18 Mar 2021 11:06:18 +0300 Subject: [PATCH 2/4] Update Qbs submodule to the top of 1.18 branch Change-Id: I42928931324eef91b155badc687ffd5d20d63749 Reviewed-by: Eike Ziller --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 0d42ca4d0f8..a5c9fa92c86 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 0d42ca4d0f8b0866b51ac9587f68a6550ca6d3fe +Subproject commit a5c9fa92c86982e0260f691ea27b790748851db6 From c34b9502275d0d1d5b88d7a63bff076e2a164836 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 19 Mar 2021 08:45:07 +0100 Subject: [PATCH 3/4] Add changes file for 4.14.2 Change-Id: Iaec33f8ffa103c335070ec363b9943fcbde86432 Reviewed-by: Leena Miettinen --- dist/changes-4.14.2.md | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 dist/changes-4.14.2.md diff --git a/dist/changes-4.14.2.md b/dist/changes-4.14.2.md new file mode 100644 index 00000000000..90d8cb5d2ba --- /dev/null +++ b/dist/changes-4.14.2.md @@ -0,0 +1,54 @@ +Qt Creator 4.14.2 +================= + +Qt Creator version 4.14.2 contains bug fixes. + +The most important changes are listed in this document. For a complete +list of changes, see the Git log for the Qt Creator sources that +you can check out from the public Git repository. For example: + + git clone git://code.qt.io/qt-creator/qt-creator.git + git log --cherry-pick --pretty=oneline origin/v4.14.1..v4.14.2 + +General +------- + +### Building Qt Creator with CMake + +* Fixed installation location of desktop and appstream files + +Help +---- + +* Fixed crash with `Previous/Next Open Document in History` (QDS-3743) + +Editing +------- + +* Re-added generic highlighting for Autoconf files (QTCREATORBUG-25391) + +Debugging +--------- + +### LLDB + +* Fixed performance issue (QTCREATORBUG-25185, QTCREATORBUG-25217) + +Platforms +--------- + +### macOS + +* Fixed vanishing controls in Welcome mode in Dark Mode (QTCREATORBUG-25405) + +Credits for these changes go to: +-------------------------------- +Alessandro Portale +Christian Stenger +Christophe Giboudeaux +David Schulz +Eike Ziller +Heiko Becker +Ivan Komissarov +Miikka Heikkinen +Robert Löhning From 7ec825be5ed2f3e837fdd6623e8188dc69663a76 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 19 Mar 2021 11:57:58 +0100 Subject: [PATCH 4/4] Android: Ignore an error when doing an incremental build Since this is not really an error but it is outputted to stderr, we need to explicitly ignore it so it does not show an error dialog. Change-Id: Ia972cf134278216c317649b5483e3deac683374d Reviewed-by: Assam Boudjelthia --- src/plugins/android/androiddeployqtstep.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 9a4e6b5ae9b..d2adfb8944b 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -562,7 +562,7 @@ void AndroidDeployQtStep::stdError(const QString &line) if (newOutput.startsWith("warning", Qt::CaseInsensitive) || newOutput.startsWith("note", Qt::CaseInsensitive)) TaskHub::addTask(DeploymentTask(Task::Warning, newOutput)); - else + else if (newOutput != QLatin1String("All files should be loaded. Notifying the device.")) TaskHub::addTask(DeploymentTask(Task::Error, newOutput)); }