diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
| commit | ef177a48f2c6c41549ef9d11a985ab2661942638 (patch) | |
| tree | d6bc5aa8cbde95d9e9857ead4b509e8b04b524b9 /config.tests | |
| parent | 396ca081d7b0d9dab7de14ebaec7943c3f857a24 (diff) | |
| parent | e5bc5a6dbdd915e0b19cfc43e7af17e43c1a7878 (diff) | |
Merge branch '5.12' into dev
Conflicts:
src/core/compositor/compositor.cpp
src/core/compositor/compositor.h
Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/re2/re2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config.tests/re2/re2.cpp b/config.tests/re2/re2.cpp index f2c0b0170..bd3b80a82 100644 --- a/config.tests/re2/re2.cpp +++ b/config.tests/re2/re2.cpp @@ -30,6 +30,7 @@ int main(int, char **) { - RE2 re2("dummytest"); + std::string s("dummytest"); + RE2 re2(s); return 0; } |