diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
| commit | dbafabb019eac6ab21b43279b3a348e4afbd065e (patch) | |
| tree | 24245148e3f0b948df06823d879f9158d1b81d2f /mkspecs/linux-icc | |
| parent | 00b96399e6d3bcd7a1081721cafeb15da3ab9781 (diff) | |
| parent | 9de2853a942529f88815ed29375ff4efc44d168c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/global/qglobal.h
Change-Id: I03d8b6e07135056baaa1d97c3c63fbe8b25583d9
Diffstat (limited to 'mkspecs/linux-icc')
| -rw-r--r-- | mkspecs/linux-icc/qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 6c5cbe496d..1b71588b8c 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -3,7 +3,6 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += gdb_dwarf_index QMAKE_COMPILER = gcc intel_icc # icc pretends to be gcc |