Upstream: Misc integration - includes qobject.h and related sources

Change-Id: Idfa93ab5c67c95a3bc1869eeaf3a84a75fe24cd6
diff --git a/hxtool b/hxtool
index 885abe2..0fdbc64 100755
--- a/hxtool
+++ b/hxtool
@@ -26,10 +26,10 @@
             STEXI*|ETEXI*) flag=$(($flag^1))
             ;;
             DEFHEADING*)
-            echo $(expr "$str" : "DEFHEADING(\(.*\))")
+            echo "$(expr "$str" : "DEFHEADING(\(.*\))")"
             ;;
             *)
-            test $flag -eq 1 && echo $str
+            test $flag -eq 1 && echo "$str"
             ;;
         esac
     done