diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-23 10:36:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 10:42:53 +0200 |
| commit | b7a905a4f2f43b856e5f365439fb21b70a03682e (patch) | |
| tree | 0712f43bbeec8c03e739110ddfa584943bf6fdac /src/core/config/linux.pri | |
| parent | e710d15b7243f2fbc99f98c3ca79d325eb459ac7 (diff) | |
| parent | e02bcb0855ebee0612cab0f3cd3f9fd494497336 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty
src/core/net/network_delegate_qt.cpp
tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
Change-Id: Ib715b3047213583e0441b915d3cabb801d9d4ba8
Diffstat (limited to 'src/core/config/linux.pri')
| -rw-r--r-- | src/core/config/linux.pri | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index fcce4c316..e45273cca 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -1,4 +1,10 @@ include(common.pri) +include(functions.pri) + +defineReplace(extractCFlag) { + return($$qtwebengine_extractCFlag($$1)) +} + QT_FOR_CONFIG += gui-private webenginecore-private gn_args += \ |