diff options
authorJoerg Bornemann <>2018-12-13 12:56:59 +0100
committerEike Ziller <>2018-12-19 10:37:23 +0000
commitf1eda7fba3602f8fce0c82f8ca4aae75cea8a4b8 (patch)
parentbe49ed1a5d1f79dab1d5d5adf1110061aa5e302f (diff)
Change-Id: I1f307b6fb62efae73f9997952255f5882810ee22 Reviewed-by: David Schulz <> Reviewed-by: Eike Ziller <>
-rw-r--r--win32/bin/jom.exebin2654208 -> 2750464 bytes
2 files changed, 11 insertions, 1 deletions
diff --git a/win32/bin/changelog.jom.txt b/win32/bin/changelog.jom.txt
index e333847..f85da57 100644
--- a/win32/bin/changelog.jom.txt
+++ b/win32/bin/changelog.jom.txt
@@ -1,4 +1,14 @@
-This is the changelog for jom 1.1.2, the parallel make tool.
+This is the changelog for jom 1.1.3, the parallel make tool.
+Changes since jom 1.1.2
+- Removed the /KEEPTEMPFILES option. This option only worked for top-level make
+ files anyway and was less useful than intended. Use the /U option to display
+ the content of inline files instead.
+- Fixed an issue where jom.exe would try to load qt.conf from drive E.
+- Fixed handling of double backslash at the end of line (QTCREATORBUG-20550).
+- Fixed handling of line continuations in preprocessor directives
+- Fixed the CMake project file.
Changes since jom 1.1.1
- Fixed exit code propagation in xgejom.bat and ibjom.bat (QTCREATORBUG-16619).
diff --git a/win32/bin/jom.exe b/win32/bin/jom.exe
index acb7902..14a199a 100644
--- a/win32/bin/jom.exe
+++ b/win32/bin/jom.exe
Binary files differ