diff --git a/common.pri b/common.pri
index fe4a303a7c..b6c58a7db6 100644
--- a/common.pri
+++ b/common.pri
@@ -104,7 +104,7 @@ win32-msvc2010 {
 unix|win32-g++ {
   QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare -Wno-strict-aliasing -Wno-unused-parameter \
       -Werror=return-type
-  !*-g++* {
+  *-clang {
     QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion
   }
   # experimental
diff --git a/tools/mkspecs/iphonedevice-llvm/qmake.conf b/tools/mkspecs/iphonedevice-llvm/qmake.conf
index 6256189f52..67037f6ce8 100644
--- a/tools/mkspecs/iphonedevice-llvm/qmake.conf
+++ b/tools/mkspecs/iphonedevice-llvm/qmake.conf
@@ -13,8 +13,8 @@ TEMPLATE                  = app
 CONFIG                   += hide_symbols warn_on dwarf2 app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QMAKE_INCREMENTAL_STYLE   = sublib
 
-QMAKE_CC                  = llvm-gcc -std=c99 -arch armv6 -mno-thumb
-QMAKE_CXX                 = llvm-g++ -arch armv6 -mno-thumb
+QMAKE_CC                  = llvm-gcc -std=c99 -arch armv6 -mno-thumb -arch armv7 -mthumb
+QMAKE_CXX                 = llvm-g++ -arch armv6 -mno-thumb -arch armv7 -mthumb
 
 QMAKE_RESOURCE            =