diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:05:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:05:03 +0100 |
| commit | a21313fea09c6b6b44398424a0a14920911dc186 (patch) | |
| tree | 35fd3329cd6e2559a999418c9129fcf2e7d41dfc | |
| parent | 5ccd29d6720260712655cc6f722824e5fcf11fb3 (diff) | |
| parent | 3e1692bebdf2e4c69adb2a23718ad230a74992dd (diff) | |
| download | qtscript-a21313fea09c6b6b44398424a0a14920911dc186.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iccc9e012e446c72292d5c8ef4a45a735a4e88025
| -rw-r--r-- | configure.json | 5 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 2 | ||||
| -rw-r--r-- | src/script/configure.json | 23 | ||||
| -rw-r--r-- | src/script/script.pro | 2 |
4 files changed, 31 insertions, 1 deletions
diff --git a/configure.json b/configure.json new file mode 100644 index 0000000..63ea575 --- /dev/null +++ b/configure.json @@ -0,0 +1,5 @@ +{ + "subconfigs": [ + "src/script" + ] +} diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp index f42e69d..0e64ea1 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -36,7 +36,7 @@ #include <fcntl.h> #include <unistd.h> #include <elf.h> -# if OS(ANDROID) && PLATFORM(QT) +# if OS(ANDROID) && PLATFORM(QT) && !defined(HAVE_asm_hwcap_h) # include <asm/procinfo.h> # else # include <asm/hwcap.h> diff --git a/src/script/configure.json b/src/script/configure.json new file mode 100644 index 0000000..d8b45c9 --- /dev/null +++ b/src/script/configure.json @@ -0,0 +1,23 @@ +{ + "module": "script", + "testDir": "../../config.tests", + + "tests": { + "asm_hwcap_h": { + "label": "asm/hwcap.h", + "condition": "config.android", + "type": "compile", + "test": { + "include": "asm/hwcap.h" + } + } + }, + + "features": { + "asm_hwcap_h": { + "label": "asm/hwcap.h", + "condition": "config.android && tests.asm_hwcap_h", + "output": [ "privateFeature" ] + } + } +} 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 |