diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-11-12 15:50:40 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-13 09:45:24 +0000 |
| commit | e051d18c09edb4bff96a80d7068d46a7391ff26a (patch) | |
| tree | a007aa0178629677a9642dccdf0a1483427e61c8 | |
| parent | bd5c05f33e40fa6089cfd3525991088fe02ec438 (diff) | |
Only include one of gl3stub.cpp or gl3stub.c in the Android teapot test
The .c file was renamed to .cpp at some point, but both copies remain in
the samples repository. Listing both will result in duplicate
gl3stubInit symbols during linking.
Change-Id: Ifb9bbbdb9b955bc3811aa5d0bb5ce722bf6c3565
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | tests/auto/blackbox/testdata-android/teapot/teapot.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs index 4bd8d8b7f..7df17226e 100644 --- a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs +++ b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs @@ -45,7 +45,8 @@ Project { Group { id: ndkhelper_sources prefix: ndkHelperProbe.dir - files: ["*.c", "*.cpp", "*.h"] + files: ["*.cpp", "*.h"].concat( + !File.exists(ndkHelperProbe.dir + "/gl3stub.cpp") ? ["gl3stub.c"] : []) } Android.ndk.appStl: "gnustl_shared" cpp.cxxLanguageVersion: "c++11" |