Fix some minor issues

Change-Id: I4589d9713f2ad0df2cbff0a95c0c74628c5fbf38
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

3 files changed, 9 insertions, 8 deletions

diff --git a/src/common-lib/crashhandler.cpp b/src/common-lib/crashhandler.cpp
index 27b227a0..22683612 100644
--- a/src/common-lib/crashhandler.cpp
+++ b/src/common-lib/crashhandler.cpp
@@ -406,12 +406,13 @@ static void logCrashInfo(LogToDestination logTo, const char *why, int stackFrame
 
     if (printBacktrace) {
         if (!QLibraryInfo::isDebugBuild()) {
-            logMsgF(logTo, "\n > Your binary is build in release mode. The provided stacktrace might not very accurate.");
-            logMsgF(logTo, " > Please consider using a debug build for a more accurate stacktrace.");
-#    if defined(Q_OS_MACOS)
-            logMsgF(logTo, " > E.g. By running the binary using DYLD_IMAGE_SUFFIX=_debug");
+            logMsgF(logTo, "\n > Your binary is built in release mode. The following backtrace might be inaccurate.");
+            logMsgF(logTo, " > Please consider using a debug build for a more accurate backtrace.");
+#  if defined(Q_OS_MACOS)
+            logMsgF(logTo, " > E.g. by running the binary using DYLD_IMAGE_SUFFIX=_debug");
 #  endif
         }
+
 #  if defined(AM_USE_LIBBACKTRACE) && defined(BACKTRACE_SUPPORTED)
         struct btData
         {
@@ -487,7 +488,7 @@ static void logCrashInfo(LogToDestination logTo, const char *why, int stackFrame
         int addrCount = backtrace(addrArray, sizeof(addrArray) / sizeof(*addrArray));
 
         if (!addrCount) {
-            logMsg(logTo, " > no backtrace available");
+            logMsg(logTo, " > no C++ backtrace available");
         } else {
             //backtrace_symbols_fd(addrArray, addrCount, 2);
             char **symbols = backtrace_symbols(addrArray, addrCount);
@@ -495,7 +496,7 @@ static void logCrashInfo(LogToDestination logTo, const char *why, int stackFrame
             if (!symbols) {
                 logMsg(logTo, " > no symbol names available");
             } else {
-                logMsg(logTo, "\n > backtrace:");
+                logMsg(logTo, "\n > C++ backtrace:");
                 for (int i = 1; i < addrCount; ++i) {
                     char *function = nullptr;
                     char *offset = nullptr;
diff --git a/tests/qml/windowmapping/tst_windowmapping.qml b/tests/qml/windowmapping/tst_windowmapping.qml
index dda075e5..256dd5d2 100644
--- a/tests/qml/windowmapping/tst_windowmapping.qml
+++ b/tests/qml/windowmapping/tst_windowmapping.qml
@@ -314,7 +314,7 @@ TestCase {
         compare(allProps.objectName, 42);
     }
 
-    // Checks that window properties survice show/hide cycles
+    // Checks that window properties survive show/hide cycles
     // Regression test for https://bugreports.qt.io/browse/AUTOSUITE-447
     function test_window_properties_survive_show_hide() {
         var app = ApplicationManager.application("test.winmap.amwin");
diff --git a/util/bash/appman-prompt b/util/bash/appman-prompt
index 0538274e..96bd017c 100644
--- a/util/bash/appman-prompt
+++ b/util/bash/appman-prompt
@@ -34,7 +34,7 @@ _appman()
     cur="${COMP_WORDS[COMP_CWORD]}"
     opts="--app-image-mount-dir --build-config --builtin-apps-manifest-dir -c --clear-cache --config-file \
 --database --dbus --force-multi-process --force-single-process --fullscreen --help -I \
---installed-apps-manifest-dir --load-dummydata --logging-rule --no-cache --no-dlt-logging \
+--installed-apps-manifest-dir --load-dummydata --log-instant --logging-rule --no-cache --no-dlt-logging \
 --no-fullscreen --no-security --no-ui-watchdog -o --option --qml-debug --single-app \
 --slow-animations --verbose --version --wayland-socket-name"