diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 03:00:28 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 03:00:28 +0100 |
| commit | ddb22273afe2ad6f71b04bcfb614a9280fa3124e (patch) | |
| tree | d91c305bbd9203d908c9814df2c120265f8fddc8 /src/script/script.pro | |
| parent | 82fc990b849fb3e1296b73169bc21b746664d987 (diff) | |
| parent | cb263c98022d5d94460a9bdf4c2d7cd5d57558b3 (diff) | |
| download | qtscript-ddb22273afe2ad6f71b04bcfb614a9280fa3124e.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I81a3361580e025ea2a5984d2e7c552de96cbcf87
Diffstat (limited to 'src/script/script.pro')
| -rw-r--r-- | src/script/script.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index cedc173..228f486 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -36,6 +36,8 @@ mac { } } +qtConfig(asm_hwcap_h): DEFINES += HAVE_asm_hwcap_h + # Suppress 'LEAK' messages (see QTBUG-18201) DEFINES += LOG_DISABLED=1 |