diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-28 11:57:21 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-28 15:13:59 +0200 |
| commit | 7c8c8272b49372b2a9fd4f95b7a7f31347c06497 (patch) | |
| tree | 3f8555a459adcbfa0955d86266876d4b03e8dc9c /src/3rdparty | |
| parent | b56dc55c3a5c4164ad84fd61c44638a3cb196978 (diff) | |
Actually apply the shadow stack Intel CET flags
C&P mistake dropped $$ from qmake variables, my fault.
Will squash manually in 5.15 to avoid introducing a bug there.
Amends fa98adbd04.
Change-Id: I3ce33dba16f512cd20c8d3c6adc4c1a09506c1ea
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/pcre2/pcre2.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/pcre2/pcre2.pri b/src/3rdparty/pcre2/pcre2.pri index b11ec7302a..ace72ec93e 100644 --- a/src/3rdparty/pcre2/pcre2.pri +++ b/src/3rdparty/pcre2/pcre2.pri @@ -6,8 +6,8 @@ win32: MODULE_DEFINES += PCRE2_STATIC DEFINES += HAVE_CONFIG_H qtConfig(intelcet) { - QMAKE_CFLAGS += QMAKE_CFLAGS_SHSTK - QMAKE_CXXFLAGS += QMAKE_CXXFLAGS_SHSTK + QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHSTK + QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHSTK } SOURCES += \ |