From fff5a8f9c987e5e285b2665c4d0a1c5bbe3e6276 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 13 Sep 2012 22:17:33 +0200 Subject: [PATCH] make qmakespecs announce the compiler family on the way to eliminate scoping based on the spec. gcc and msvc go as such into CONFIG, the other ones get the vendor prefixed, as most are mostly unknown and thus likely to clash with users' flags. Change-Id: Ie622f53d90e96dbf05ce7d8c638cd355f04fa20c Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- mkspecs/aix-g++-64/qmake.conf | 2 ++ mkspecs/aix-g++/qmake.conf | 2 ++ mkspecs/aix-xlc-64/qmake.conf | 2 ++ mkspecs/aix-xlc/qmake.conf | 2 ++ mkspecs/common/armcc.conf | 2 ++ mkspecs/common/clang.conf | 2 ++ mkspecs/common/g++-base.conf | 2 ++ mkspecs/common/llvm.conf | 2 ++ mkspecs/common/qcc-base.conf | 2 ++ mkspecs/common/wince/qmake.conf | 2 ++ mkspecs/cygwin-g++/qmake.conf | 2 ++ mkspecs/darwin-g++/qmake.conf | 2 ++ mkspecs/features/spec_post.prf | 15 +++++++++++++++ mkspecs/freebsd-icc/qmake.conf | 2 ++ mkspecs/hpux-acc-64/qmake.conf | 2 ++ mkspecs/hpux-acc-o64/qmake.conf | 2 ++ mkspecs/hpux-acc/qmake.conf | 2 ++ mkspecs/hpux-g++-64/qmake.conf | 2 ++ mkspecs/hpux-g++/qmake.conf | 2 ++ mkspecs/hpuxi-acc-32/qmake.conf | 2 ++ mkspecs/hpuxi-acc-64/qmake.conf | 2 ++ mkspecs/hpuxi-g++-64/qmake.conf | 2 ++ mkspecs/irix-cc-64/qmake.conf | 2 ++ mkspecs/irix-cc/qmake.conf | 2 ++ mkspecs/irix-g++-64/qmake.conf | 2 ++ mkspecs/irix-g++/qmake.conf | 2 ++ mkspecs/linux-cxx/qmake.conf | 2 ++ mkspecs/linux-icc/qmake.conf | 2 ++ mkspecs/linux-kcc/qmake.conf | 2 ++ mkspecs/linux-pgcc/qmake.conf | 2 ++ mkspecs/lynxos-g++/qmake.conf | 2 ++ mkspecs/macx-icc/qmake.conf | 2 ++ mkspecs/macx-xlc/qmake.conf | 2 ++ mkspecs/netbsd-g++/qmake.conf | 2 ++ mkspecs/openbsd-g++/qmake.conf | 2 ++ mkspecs/sco-cc/qmake.conf | 2 ++ mkspecs/sco-g++/qmake.conf | 2 ++ mkspecs/solaris-cc-64/qmake.conf | 2 ++ mkspecs/solaris-cc/qmake.conf | 2 ++ mkspecs/solaris-g++-64/qmake.conf | 2 ++ mkspecs/solaris-g++/qmake.conf | 2 ++ mkspecs/tru64-cxx/qmake.conf | 2 ++ mkspecs/tru64-g++/qmake.conf | 2 ++ mkspecs/unixware-cc/qmake.conf | 2 ++ mkspecs/unixware-g++/qmake.conf | 2 ++ mkspecs/unsupported/linux-host-g++/qmake.conf | 2 ++ mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf | 2 ++ mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf | 2 ++ mkspecs/unsupported/win32-msvc2003/qmake.conf | 2 ++ mkspecs/win32-g++/qmake.conf | 2 ++ mkspecs/win32-icc/qmake.conf | 2 ++ mkspecs/win32-msvc2005/qmake.conf | 2 ++ mkspecs/win32-msvc2008/qmake.conf | 2 ++ mkspecs/win32-msvc2010/qmake.conf | 2 ++ mkspecs/win32-msvc2012/qmake.conf | 2 ++ 55 files changed, 123 insertions(+) diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf index c52a554..a1e9bd5 100644 --- a/mkspecs/aix-g++-64/qmake.conf +++ b/mkspecs/aix-g++-64/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = aix +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf index 353e1ba..5f7b8b4 100644 --- a/mkspecs/aix-g++/qmake.conf +++ b/mkspecs/aix-g++/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = aix +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf index 0fc0266..a0d4ba0 100644 --- a/mkspecs/aix-xlc-64/qmake.conf +++ b/mkspecs/aix-xlc-64/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = aix +QMAKE_COMPILER = ibm_xlc + QMAKE_CC = xlc QMAKE_CC_THREAD = xlc_r QMAKE_LEX = flex diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index 59c067c..163e534 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = aix +QMAKE_COMPILER = ibm_xlc + QMAKE_CC = xlc QMAKE_CC_THREAD = xlc_r QMAKE_LEX = flex diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf index 4f178d7..443ff40 100644 --- a/mkspecs/common/armcc.conf +++ b/mkspecs/common/armcc.conf @@ -2,6 +2,8 @@ # qmake configuration for armcc # +QMAKE_COMPILER = armcc + CONFIG += rvct_linker QMAKE_CC = armcc QMAKE_CFLAGS += diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf index 54ac569..8c97644 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -2,6 +2,8 @@ # Qmake configuration for Clang on Linux and Mac # +QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc + QMAKE_CC = clang QMAKE_CXX = clang++ diff --git a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf index 35f86e5..0661298 100644 --- a/mkspecs/common/g++-base.conf +++ b/mkspecs/common/g++-base.conf @@ -8,6 +8,8 @@ # you can use the manual test in tests/manual/mkspecs. # +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LINK_C = $$QMAKE_CC diff --git a/mkspecs/common/llvm.conf b/mkspecs/common/llvm.conf index 86e0ab4..7d0622d 100644 --- a/mkspecs/common/llvm.conf +++ b/mkspecs/common/llvm.conf @@ -2,6 +2,8 @@ # Qmake configuration for LLVM on Linux and Mac # +QMAKE_COMPILER = gcc llvm + QMAKE_CC = llvm-gcc QMAKE_CXX = llvm-g++ diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf index 42a2d31..b6abb8f 100644 --- a/mkspecs/common/qcc-base.conf +++ b/mkspecs/common/qcc-base.conf @@ -9,6 +9,8 @@ # 2) -Wno-psabi is added to silence harmless warnings about va_list mangling # +QMAKE_COMPILER = rim_qcc gcc # qcc is mostly gcc in disguise + QMAKE_CFLAGS += -Wno-psabi QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf index 236e445..46f002a 100644 --- a/mkspecs/common/wince/qmake.conf +++ b/mkspecs/common/wince/qmake.conf @@ -10,6 +10,8 @@ DEFINES += UNDER_CE WINCE _WINDOWS _UNICODE UNICODE _WIN32 QT_NO_PRINTER QT_N QMAKE_COMPILER_DEFINES += _MSC_VER=1400 +QMAKE_COMPILER = msvc + QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index 0464699..3c53122 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf @@ -9,6 +9,8 @@ QMAKE_PLATFORM = cygwin unix posix CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf index 4b8ed77..57bfb94 100644 --- a/mkspecs/darwin-g++/qmake.conf +++ b/mkspecs/darwin-g++/qmake.conf @@ -9,6 +9,8 @@ QMAKE_PLATFORM = mac macx CONFIG += native_precompiled_headers DEFINES += __USE_WS_X11__ +QMAKE_COMPILER = gcc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/features/spec_post.prf b/mkspecs/features/spec_post.prf index fcc7314..3af6bbd 100644 --- a/mkspecs/features/spec_post.prf +++ b/mkspecs/features/spec_post.prf @@ -29,3 +29,18 @@ isEmpty(QMAKE_PLATFORM) { error("Qmake spec sets an invalid TARGET_PLATFORM.") } CONFIG += $$QMAKE_PLATFORM + +isEmpty(QMAKE_COMPILER) { + *-g++*: \ + QMAKE_COMPILER = gcc + else:*-llvm*: \ + QMAKE_COMPILER = gcc llvm + else:*-clang*: \ + QMAKE_COMPILER = clang llvm + else:*-msvc*: \ + QMAKE_COMPILER = msvc + else: \ + error("qmake spec does not announce the compiler family, and it cannot be guessed.") + warning("qmake spec does not announce the compiler family. Guessed $$QMAKE_COMPILER.") +} +CONFIG += $$QMAKE_COMPILER diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf index 54566de..046b20c 100644 --- a/mkspecs/freebsd-icc/qmake.conf +++ b/mkspecs/freebsd-icc/qmake.conf @@ -30,6 +30,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = freebsd bsd +QMAKE_COMPILER = gcc intel_icc # icc pretends to be gcc + QMAKE_CC = icc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf index 22b8554..b285c2c 100644 --- a/mkspecs/hpux-acc-64/qmake.conf +++ b/mkspecs/hpux-acc-64/qmake.conf @@ -49,6 +49,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux QMAKE_COMPILER_DEFINES += __hpux __HP_aCC +QMAKE_COMPILER = hp_acc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf index 1f3c862..985378d 100644 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ b/mkspecs/hpux-acc-o64/qmake.conf @@ -48,6 +48,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux +QMAKE_COMPILER = hp_acc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf index 6d81fe5..c7cdab4 100644 --- a/mkspecs/hpux-acc/qmake.conf +++ b/mkspecs/hpux-acc/qmake.conf @@ -28,6 +28,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux QMAKE_COMPILER_DEFINES += __hpux __HP_aCC +QMAKE_COMPILER = hp_acc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf index 837a199..49eb1a3 100644 --- a/mkspecs/hpux-g++-64/qmake.conf +++ b/mkspecs/hpux-g++-64/qmake.conf @@ -8,6 +8,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf index 99c899f..eca1b32 100644 --- a/mkspecs/hpux-g++/qmake.conf +++ b/mkspecs/hpux-g++/qmake.conf @@ -9,6 +9,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux CONFIG += plugin_no_soname +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf index 7222e88..bd2a586 100644 --- a/mkspecs/hpuxi-acc-32/qmake.conf +++ b/mkspecs/hpuxi-acc-32/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux CONFIG += plugin_no_soname +QMAKE_COMPILER = hp_acc + QMAKE_CC = cc QMAKE_LEX = lex QMAKE_LEXFLAGS = diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf index 0e938ea..d7c7f7b 100644 --- a/mkspecs/hpuxi-acc-64/qmake.conf +++ b/mkspecs/hpuxi-acc-64/qmake.conf @@ -49,6 +49,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux CONFIG += plugin_no_soname +QMAKE_COMPILER = hp_acc + QMAKE_CC = cc QMAKE_LEX = lex QMAKE_LEXFLAGS = diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf index 81b1101..5703b84 100644 --- a/mkspecs/hpuxi-g++-64/qmake.conf +++ b/mkspecs/hpuxi-g++-64/qmake.conf @@ -13,6 +13,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index 0fe3188..f31094a 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf @@ -38,6 +38,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = irix QMAKE_COMPILER_DEFINES += __sgi __EDG +QMAKE_COMPILER = sgi_cc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf index 0e0582e..6e832e0 100644 --- a/mkspecs/irix-cc/qmake.conf +++ b/mkspecs/irix-cc/qmake.conf @@ -38,6 +38,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = irix QMAKE_COMPILER_DEFINES += __sgi __EDG +QMAKE_COMPILER = sgi_cc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf index 4ef6d62..637f128 100644 --- a/mkspecs/irix-g++-64/qmake.conf +++ b/mkspecs/irix-g++-64/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = irix QMAKE_COMPILER_DEFINES += __sgi __GNUC__ +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf index c8317dd..6b1dbbd 100644 --- a/mkspecs/irix-g++/qmake.conf +++ b/mkspecs/irix-g++/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = irix QMAKE_COMPILER_DEFINES += __sgi __GNUC__ +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf index 517ba00..6b3d158 100644 --- a/mkspecs/linux-cxx/qmake.conf +++ b/mkspecs/linux-cxx/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = linux +QMAKE_COMPILER = compaq_cc + QMAKE_CC = ccc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 0df0b0a..d7fe808 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX CONFIG += gdb_dwarf_index +QMAKE_COMPILER = gcc intel_icc # icc pretends to be gcc + QMAKE_CC = icc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index 54625ef..cbe474f 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf @@ -16,6 +16,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = linux +QMAKE_COMPILER = kai_cc + QMAKE_CC = KCC QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index a5f5a04..93c3762 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = linux +QMAKE_COMPILER = portland_cc + QMAKE_CC = pgcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf index 0933448..9762b4d 100644 --- a/mkspecs/lynxos-g++/qmake.conf +++ b/mkspecs/lynxos-g++/qmake.conf @@ -9,6 +9,8 @@ QMAKE_PLATFORM = lynxos CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index 6903cc4..1aa252a 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -17,6 +17,8 @@ CONFIG += app_bundle QMAKE_INCREMENTAL_STYLE = sublibs QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__ +QMAKE_COMPILER = gcc intel_icc # icc pretends to be gcc + QMAKE_CC = icc QMAKE_CFLAGS = -wd858,1572,1569,279 QMAKE_CFLAGS_DEPS = -M diff --git a/mkspecs/macx-xlc/qmake.conf b/mkspecs/macx-xlc/qmake.conf index 41dc0ab..4d7ab0b 100644 --- a/mkspecs/macx-xlc/qmake.conf +++ b/mkspecs/macx-xlc/qmake.conf @@ -8,6 +8,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = mac macx CONFIG += app_bundle global_init_link_order lib_version_first plugin_no_soname +QMAKE_COMPILER = ibm_xlc + QMAKE_CC = xlc QMAKE_CC_THREAD = xlc_r QMAKE_LEX = flex diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index 914c152..5e6dd8f 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = netbsd bsd CONFIG += gdb_dwarf_index +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf index be28558..8dc53a6 100644 --- a/mkspecs/openbsd-g++/qmake.conf +++ b/mkspecs/openbsd-g++/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = openbsd bsd CONFIG += gdb_dwarf_index +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf index 4c96847..ccd3aaa 100644 --- a/mkspecs/sco-cc/qmake.conf +++ b/mkspecs/sco-cc/qmake.conf @@ -10,6 +10,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = sco +QMAKE_COMPILER = sco_cc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf index 55073d4..68d655a 100644 --- a/mkspecs/sco-g++/qmake.conf +++ b/mkspecs/sco-g++/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = sco +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index a3180b8..f88a716 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf @@ -24,6 +24,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris +QMAKE_COMPILER = sun_cc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index 9f35083..83d3918 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris +QMAKE_COMPILER = sun_cc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index 605a2d6..96044a1 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf @@ -28,6 +28,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index a4bd6f4..ff2c01c 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf @@ -11,6 +11,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf index 5fc8433..34285d6 100644 --- a/mkspecs/tru64-cxx/qmake.conf +++ b/mkspecs/tru64-cxx/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = tru64 CONFIG += plugin_no_soname +QMAKE_COMPILER = dec_cc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf index e66a428..7e2c748 100644 --- a/mkspecs/tru64-g++/qmake.conf +++ b/mkspecs/tru64-g++/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = tru64 CONFIG += plugin_no_soname +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf index c2e5ea3..2194008 100644 --- a/mkspecs/unixware-cc/qmake.conf +++ b/mkspecs/unixware-cc/qmake.conf @@ -10,6 +10,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = unixware +QMAKE_COMPILER = sco_cc + QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf index 3466bf2..a55f570 100644 --- a/mkspecs/unixware-g++/qmake.conf +++ b/mkspecs/unixware-g++/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = unixware +QMAKE_COMPILER = gcc + QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf index 7437e78..3e5840e 100644 --- a/mkspecs/unsupported/linux-host-g++/qmake.conf +++ b/mkspecs/unsupported/linux-host-g++/qmake.conf @@ -21,6 +21,8 @@ QMAKE_INCREMENTAL_STYLE = sublib # qmake configuration for common gcc # +QMAKE_COMPILER = gcc + QMAKE_CC = host-gcc QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf index 7576b76..c5429ae 100644 --- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf +++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf @@ -12,6 +12,8 @@ VXWORKS_CPU = PPC32 VXWORKS_DIAB_SPEC = -tPPC7400FV:vxworks66 VXWORKS_ARCH_MUNCH = ppc +QMAKE_COMPILER = wr_dcc + QMAKE_CC = dcc QMAKE_CFLAGS += $$VXWORKS_DIAB_SPEC -Xkeywords=0x0 -Xcode-absolute-far -Xansi -Xforce-declarations -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=diab -DTOOL=diab -D_WRS_KERNEL -DVXWORKS -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\' QMAKE_CFLAGS_DEPS += diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf index 3cf7dec..4729daf 100644 --- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf +++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf @@ -12,6 +12,8 @@ VXWORKS_CPU = SIMLINUX VXWORKS_DIAB_SPEC = -tX86LH:vxworks66 VXWORKS_ARCH_MUNCH = pentium +QMAKE_COMPILER = wr_dcc + QMAKE_CC = dcc QMAKE_CFLAGS += $$VXWORKS_DIAB_SPEC -Xkeywords=0x0 -Xcode-absolute-far -Xansi -Xforce-declarations -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=diab -DTOOL=diab -D_WRS_KERNEL -DVXWORKS -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\' QMAKE_CFLAGS_DEPS += diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf index ba85427..3439472 100644 --- a/mkspecs/unsupported/win32-msvc2003/qmake.conf +++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf @@ -10,6 +10,8 @@ CONFIG += incremental flat precompile_header autogen_precompile DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1310 WIN32 +QMAKE_COMPILER = msvc + QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 2b1284a..16e9b89 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -18,6 +18,8 @@ QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 QMAKE_EXT_OBJ = .o QMAKE_EXT_RES = _res.o +QMAKE_COMPILER = gcc + QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 2c774ec..195fd60 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -10,6 +10,8 @@ CONFIG += incremental flat debug_and_release debug_and_release_target DEFINES += UNICODE QMAKE_COMPILER_DEFINES += __INTEL_COMPILER WIN32 +QMAKE_COMPILER = msvc intel_icl # icl pretends to be msvc + QMAKE_CC = icl QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 4b518f6..41cf0dc 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -10,6 +10,8 @@ CONFIG += incremental flat precompile_header autogen_precompile DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1400 WIN32 +QMAKE_COMPILER = msvc + QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf index 7d38024..9044dce 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/qmake.conf @@ -10,6 +10,8 @@ CONFIG += incremental flat precompile_header autogen_precompile DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1500 WIN32 +QMAKE_COMPILER = msvc + QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index 62fe007..037be97 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/qmake.conf @@ -10,6 +10,8 @@ CONFIG += incremental flat precompile_header autogen_precompile DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1600 WIN32 +QMAKE_COMPILER = msvc + QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf index a8fc08b..959690f 100644 --- a/mkspecs/win32-msvc2012/qmake.conf +++ b/mkspecs/win32-msvc2012/qmake.conf @@ -9,6 +9,8 @@ CONFIG += incremental flat precompile_header autogen_precompile DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1700 WIN32 +QMAKE_COMPILER = msvc + QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = -- 2.7.4