diff options
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/pcre/pcre.pro | 2 | ||||
| -rw-r--r-- | config.tests/unix/pcre2/pcre2.cpp (renamed from config.tests/unix/pcre/pcre.cpp) | 6 | ||||
| -rw-r--r-- | config.tests/unix/pcre2/pcre2.pro | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config.tests/unix/pcre/pcre.pro b/config.tests/unix/pcre/pcre.pro deleted file mode 100644 index a47e6d1e96..0000000000 --- a/config.tests/unix/pcre/pcre.pro +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES = pcre.cpp -CONFIG -= qt dylib diff --git a/config.tests/unix/pcre/pcre.cpp b/config.tests/unix/pcre2/pcre2.cpp index 18f7f7d954..48130f97c4 100644 --- a/config.tests/unix/pcre/pcre.cpp +++ b/config.tests/unix/pcre2/pcre2.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Giuseppe D'Angelo <dangelog@gmail.com>. +** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. @@ -37,9 +37,9 @@ ** ****************************************************************************/ -#include <pcre.h> +#include <pcre2.h> -#if (PCRE_MAJOR < 8) || ((PCRE_MAJOR == 8) && (PCRE_MINOR < 31)) +#if (PCRE2_MAJOR < 10) || ((PCRE2_MAJOR == 10) && (PCRE_MINOR < 20)) #error This PCRE version is not supported #endif diff --git a/config.tests/unix/pcre2/pcre2.pro b/config.tests/unix/pcre2/pcre2.pro new file mode 100644 index 0000000000..6a3fc275bc --- /dev/null +++ b/config.tests/unix/pcre2/pcre2.pro @@ -0,0 +1,2 @@ +SOURCES = pcre2.cpp +CONFIG -= qt dylib |