diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 11:40:41 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 12:57:21 +0200 |
commit | ecb537e8233c8847d14f36ec3bf698711d6d151a (patch) | |
tree | f9cb367d6e66067970102ed1864f7280f3750ccc /config.tests | |
parent | 9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb (diff) | |
parent | ad55613c2648edb67353c3882d1956b54fc323b4 (diff) |
Merge branch '5.9' into 5.10
Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/re2/re2.cpp (renamed from config.tests/srtp/srtp.cpp) | 8 | ||||
-rw-r--r-- | config.tests/re2/re2.pro | 3 | ||||
-rw-r--r-- | config.tests/srtp/srtp.pro | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/config.tests/srtp/srtp.cpp b/config.tests/re2/re2.cpp index 7dfcc832a..f2c0b0170 100644 --- a/config.tests/srtp/srtp.cpp +++ b/config.tests/re2/re2.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. @@ -26,10 +26,10 @@ ** ****************************************************************************/ -#include <srtp/srtp.h> +#include <re2/re2.h> int main(int, char **) { - err_status_t status = srtp_init(); - return status == err_status_ok; + RE2 re2("dummytest"); + return 0; } diff --git a/config.tests/re2/re2.pro b/config.tests/re2/re2.pro new file mode 100644 index 000000000..b1a26d918 --- /dev/null +++ b/config.tests/re2/re2.pro @@ -0,0 +1,3 @@ +SOURCES += re2.cpp +LIBS += -lre2 +CONFIG -= qt diff --git a/config.tests/srtp/srtp.pro b/config.tests/srtp/srtp.pro deleted file mode 100644 index 2151d64aa..000000000 --- a/config.tests/srtp/srtp.pro +++ /dev/null @@ -1,3 +0,0 @@ -linux:SOURCES += srtp.cpp -LIBS += -lsrtp -CONFIG -= qt |