diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:08:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:09:33 +0200 |
| commit | 9419dfe8ee45d08f09c09d3cbece511d721546f0 (patch) | |
| tree | 1c4584099fc1efb8de30cc4526ce7ebafe8a8ce9 /config.tests | |
| parent | 8b5aa7b6c40d70a7ec15b3ea485f28a142fb247c (diff) | |
| parent | 8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/arch/arch.cpp | 4 | ||||
| -rw-r--r-- | config.tests/unix/pcre2/pcre2.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp index f99c5ca118..bb3efec177 100644 --- a/config.tests/arch/arch.cpp +++ b/config.tests/arch/arch.cpp @@ -284,8 +284,12 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:" #endif ""; +extern const char msg3[]; +const char msg3[] = "==Qt=magic=Qt== Build-ABI:" ARCH_FULL; + int main() { puts(msg); puts(msg2); + puts(msg3); } diff --git a/config.tests/unix/pcre2/pcre2.cpp b/config.tests/unix/pcre2/pcre2.cpp index 48130f97c4..9c94d29999 100644 --- a/config.tests/unix/pcre2/pcre2.cpp +++ b/config.tests/unix/pcre2/pcre2.cpp @@ -37,9 +37,11 @@ ** ****************************************************************************/ +#define PCRE2_CODE_UNIT_WIDTH 16 + #include <pcre2.h> -#if (PCRE2_MAJOR < 10) || ((PCRE2_MAJOR == 10) && (PCRE_MINOR < 20)) +#if (PCRE2_MAJOR < 10) || ((PCRE2_MAJOR == 10) && (PCRE2_MINOR < 20)) #error This PCRE version is not supported #endif |