diff options
Diffstat (limited to 'tests/auto/api/testdata/link-staticlibs-dynamiclibs')
6 files changed, 20 insertions, 15 deletions
diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp index 3f8a5f8d7..b4379f8c9 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp @@ -1,11 +1,11 @@ #include "../dllexport.h" #include "static2.h" -#include <stdio.h> +#include <cstdio> DLL_EXPORT int dynamic1_hello() { TestMe tm; tm.hello(); - puts("dynamic1 says hello!"); + std::puts("dynamic1 says hello!"); return 1; } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp index 75594185e..3511b4759 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp @@ -1,7 +1,7 @@ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_EXPORT void dynamic2_hello() { - puts("dynamic2 says hello!"); + std::puts("dynamic2 says hello!"); } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs index d7ed6c862..c30cf40f9 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs @@ -14,9 +14,13 @@ Project { Probe { id: osCheck - property bool isNormalUnix: qbs.targetOS.contains("unix") - && !qbs.targetOS.contains("darwin") - configure: { console.info("is normal unix: " + (isNormalUnix ? "yes" : "no")); } + property bool isNormalUnix: qbs.targetOS.includes("unix") + && !qbs.targetOS.includes("darwin") + property bool isGcc: qbs.toolchain.contains("gcc") + configure: { + console.info("is normal unix: " + (isNormalUnix ? "yes" : "no")); + console.info("is gcc: " + isGcc); + } } } @@ -26,7 +30,7 @@ Project { Depends { name: "cpp" } Depends { name: "static2" } Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } @@ -44,7 +48,7 @@ Project { Depends { name: "cpp" } cpp.visibility: 'hidden' Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/main.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/main.cpp index 4b8193341..b9e522ac4 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/main.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/main.cpp @@ -1,10 +1,10 @@ -#include <stdio.h> +#include <cstdio> void static1_hello(); int main() { static1_hello(); - puts("application says hello!"); + std::puts("application says hello!"); return 0; } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp index a3058c63b..320344f91 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp @@ -1,10 +1,11 @@ #include "../dllexport.h" -#include <stdio.h> + +#include <cstdio> DLL_IMPORT int dynamic1_hello(); void static1_hello() { int n = dynamic1_hello(); - printf("static%d says hello!\n", n); + std::printf("static%d says hello!\n", n); } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp index 374bf7ceb..88c6d2a3f 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp @@ -1,11 +1,11 @@ #include "../dllexport.h" #include "static2.h" -#include <stdio.h> +#include <cstdio> DLL_IMPORT void dynamic2_hello(); void TestMe::hello() const { dynamic2_hello(); - puts("static2 says hello!"); + std::puts("static2 says hello!"); } |