diff options
| author | Allan Jensen <allan.jensen@qt.io> | 2019-03-29 17:27:19 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-02 11:05:19 +0000 |
| commit | 46ac6474ea4f5592863dbcb295e53080b2e56086 (patch) | |
| tree | 0249e7398446360633cc7a80d0230a402c6823eb /mkspecs | |
| parent | b546cea1b5ba6721bf7fcb687c6c069d4442ba34 (diff) | |
Support clang_cl builds on Windows
Change-Id: I1f3e8fc378cfceda92ff17fcc7669c0f5d97c3f7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/gn_generator.prf | 7 | ||||
| -rw-r--r-- | mkspecs/features/platform.prf | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf index 4efbd92f2..78b56d123 100644 --- a/mkspecs/features/gn_generator.prf +++ b/mkspecs/features/gn_generator.prf @@ -120,13 +120,18 @@ GN_CONTENTS += "config(\"$${TARGET}_config\") {" } # Stop the barrage of unused variables warnings. -gcc|clang { +gcc|clang|clang_cl { QMAKE_CXXFLAGS += "-Wno-unused-parameter" QMAKE_CXXFLAGS += "-Wno-unused-variable" } else:msvc { QMAKE_CXXFLAGS += /wd4100 /wd4101 } +# Chromium activates this, but we need it off to be able to compile QFlags +clang_cl { + QMAKE_CXXFLAGS += "-fno-complete-member-pointers" +} + !isEmpty(QMAKE_CXXFLAGS) { GN_CONTENTS += " cflags_cc = [" for(flag, QMAKE_CXXFLAGS): GN_CONTENTS += " \"$$filter_flag_values($$flag)\"," diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index 35eb6b89c..67be73f74 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -26,7 +26,7 @@ defineTest(isPlatformSupported) { skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.") } !msvc|intel_icl { - skipBuild("Qt WebEngine on Windows requires MSVC.") + skipBuild("Qt WebEngine on Windows requires MSVC or Clang (MSVC mode).") return(false) } !isMinWinSDKVersion(10, 16299): { |