AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually apply the shadow stack Intel CET flags

Browse Source 
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>
This commit is contained in:
Giuseppe D'Angelo 2020-05-28 11:57:21 +02:00
parent b56dc55c3a
commit 7c8c8272b4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdparty/pcre2/pcre2.pri vendored
View File

@ -6,8 +6,8 @@ win32: MODULE_DEFINES += PCRE2_STATIC
DEFINES += HAVE_CONFIG_H DEFINES += HAVE_CONFIG_H
qtConfig(intelcet) { qtConfig(intelcet) {
QMAKE_CFLAGS += QMAKE_CFLAGS_SHSTK QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHSTK
QMAKE_CXXFLAGS += QMAKE_CXXFLAGS_SHSTK QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHSTK
} }
SOURCES += \ SOURCES += \