diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
| commit | ef177a48f2c6c41549ef9d11a985ab2661942638 (patch) | |
| tree | d6bc5aa8cbde95d9e9857ead4b509e8b04b524b9 /mkspecs | |
| parent | 396ca081d7b0d9dab7de14ebaec7943c3f857a24 (diff) | |
| parent | e5bc5a6dbdd915e0b19cfc43e7af17e43c1a7878 (diff) | |
Merge branch '5.12' into dev
Conflicts:
src/core/compositor/compositor.cpp
src/core/compositor/compositor.h
Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/gn_generator.prf | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf index 88f64fa91..c1399a453 100644 --- a/mkspecs/features/gn_generator.prf +++ b/mkspecs/features/gn_generator.prf @@ -208,6 +208,18 @@ GN_CONTENTS += " if (!defined(deps)) {"\ GN_CONTENTS += " ]" } +# Remove the default no_rtti config for our own cpp files, thus leaving the decision +# to the compiler's defaults. This is consistent with how qtbase does it. +# Unless the user explicitly configured Qt with a different RTTI setting. +# Windows only for now, because macOS (and presumably Linux) does not support +# partial rtti info (e.g. rtti info present for derived class, but not base class), and the +# qtbase rtti feature affects only Windows. +win32 { + GN_CONTENTS += " configs -= [\"//build/config/compiler:no_rtti\"]" + CONFIG(rtti_off): GN_CONTENTS += " configs += [\"//build/config/compiler:no_rtti\"]" + CONFIG(rtti): GN_CONTENTS += " configs += [\"//build/config/compiler:rtti\"]" +} + GN_CONTENTS += " if (moc_source_h_files != []) {" GN_CONTENTS += " deps += [" GN_CONTENTS += " \":generate_h_mocs\"," |