diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-01-23 21:27:28 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-02 00:13:11 +0200 |
| commit | ebae9d77fa9f675c281f59e120ffc1e1b81cdf05 (patch) | |
| tree | 6e4a7798cae77c044e963924101949be42fbcd54 | |
| parent | be96f33d7d8355c0d388a8577d4a4ea2a4d5f5a9 (diff) | |
| download | qtwebkit-ebae9d77fa9f675c281f59e120ffc1e1b81cdf05.tar.gz | |
Actually load icc.prf for the Intel compiler
Nothing sets CONFIG += icc, so the .prf file was not getting loaded at
all. So force it on both Windows and Unix.
Change-Id: I0c9a0ab07b5637716e37fb2066d6013fa28c4012
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/icc.prf (renamed from Tools/qmake/mkspecs/features/unix/icc.prf) | 0 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/unix/default_post.prf | 4 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/win32/default_post.prf | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/unix/icc.prf b/Tools/qmake/mkspecs/features/icc.prf index e9bfddd1c..e9bfddd1c 100644 --- a/Tools/qmake/mkspecs/features/unix/icc.prf +++ b/Tools/qmake/mkspecs/features/icc.prf diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf index 75df1c550..7a94845e9 100644 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf @@ -4,6 +4,10 @@ # See 'Tools/qmake/README' for an overview of the build system # ------------------------------------------------------------------- +# Disable a few warnings. The same warnings are also disabled +# in WebKitLibraries/win/tools/vsprops/common.vsprops +intel_icc: load(icc) + # Use SSE2 floating point math on 32 bit instead of the default # 387 to make layout test results same on 32 and on 64 bit builds. # See https://bugs.webkit.org/show_bug.cgi?id=52810#c39 for details. diff --git a/Tools/qmake/mkspecs/features/win32/default_post.prf b/Tools/qmake/mkspecs/features/win32/default_post.prf index 8c8ac750b..e2567233f 100644 --- a/Tools/qmake/mkspecs/features/win32/default_post.prf +++ b/Tools/qmake/mkspecs/features/win32/default_post.prf @@ -15,7 +15,7 @@ mingw { # Disable a few warnings. The same warnings are also disabled # in WebKitLibraries/win/tools/vsprops/common.vsprops win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996 -win32-icc: QMAKE_CXXFLAGS += -wd873 +intel_icl: load(icc) load(default_post) |