diff --git a/qt-creator.spec b/qt-creator.spec
index 59b9dd0..48357f6 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -21,6 +21,8 @@ Patch0:         qt-creator_ninja-build.patch
 Patch1:         qt-creator_appdata.patch
 # Fix leading whitespace in desktop file
 Patch2:         qt-creator_desktop.patch
+# Compatibility with clang 9
+Patch3:         qt-creator_clang9.patch
 
 # tight dep on qt5-qtbase used to build, uses some private apis
 BuildRequires:  qt5-qtbase-private-devel
@@ -165,10 +167,11 @@ diff -u %{SOURCE1} $outfile
 
 
 %changelog
-* Wed Sep 25 2019 Jan Grulich <jgrulich@redhat.com>
+* Wed Sep 25 2019 Jan Grulich <jgrulich@redhat.com> - 4.10.0-7
 - rebuild (qt5)
+- Fix build against clang-9
 
-* Thu Sep 05 2019 Sandro Mani <manisandro@gmail.com> - 4.10.0-1
+* Thu Sep 05 2019 Sandro Mani <manisandro@gmail.com> - 4.10.0-6
 - Update to 4.10.0
 
 * Mon Aug 05 2019 Sandro Mani <manisandro@gmail.com> - 4.10.0-5.rc1
diff --git a/qt-creator_clang9.patch b/qt-creator_clang9.patch
new file mode 100644
index 0000000..0fc9418
--- /dev/null
+++ b/qt-creator_clang9.patch
@@ -0,0 +1,12 @@
+diff -rupN qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp
+--- qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp	2019-09-03 16:36:38.000000000 +0200
++++ qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp	2019-09-25 13:33:27.230835047 +0200
+@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcSty
+     style.AllowShortBlocksOnASingleLine = false;
+     style.AllowShortCaseLabelsOnASingleLine = false;
+     style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
+-    style.AllowShortIfStatementsOnASingleLine = false;
++    style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never;
+     style.AllowShortLoopsOnASingleLine = false;
+     style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
+     style.AlwaysBreakBeforeMultilineStrings = false;