diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-23 10:58:02 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-23 13:08:07 +0000 |
| commit | 056d25f2270c6cc0e32cd7a55e80f2d420ca447d (patch) | |
| tree | 7ef5ea2cc2f95157f3dc09da325e709e881d019c /tests/auto/api/testdata/link-staticlibs-dynamiclibs | |
| parent | 31fc946bb5ffecdd907f3303536c7abc9a4b4495 (diff) | |
Autotest: Create a convenience header for DLL import/export macros
It's annoying having to write this again for every autotest involving
shared libs.
Change-Id: Ief6a11f8df2810166606874d24bfa9820af00d16
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto/api/testdata/link-staticlibs-dynamiclibs')
4 files changed, 8 insertions, 28 deletions
diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp index d790eb841..3f8a5f8d7 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp @@ -1,13 +1,8 @@ +#include "../dllexport.h" #include "static2.h" #include <stdio.h> -#if defined(_WIN32) || defined(WIN32) -# define EXPORT __declspec(dllexport) -#else -# define EXPORT -#endif - -EXPORT int dynamic1_hello() +DLL_EXPORT int dynamic1_hello() { TestMe tm; tm.hello(); diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp index ec6b7c845..75594185e 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp @@ -1,12 +1,7 @@ +#include "../dllexport.h" #include <stdio.h> -#if defined(_WIN32) || defined(WIN32) -# define EXPORT __declspec(dllexport) -#else -# define EXPORT __attribute__((visibility("default"))) -#endif - -EXPORT void dynamic2_hello() +DLL_EXPORT void dynamic2_hello() { puts("dynamic2 says hello!"); } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp index 21ddbff5e..a3058c63b 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp @@ -1,12 +1,7 @@ +#include "../dllexport.h" #include <stdio.h> -#if defined(_WIN32) || defined(WIN32) -# define IMPORT __declspec(dllimport) -#else -# define IMPORT -#endif - -IMPORT int dynamic1_hello(); +DLL_IMPORT int dynamic1_hello(); void static1_hello() { diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp index ef5370400..374bf7ceb 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp @@ -1,13 +1,8 @@ +#include "../dllexport.h" #include "static2.h" #include <stdio.h> -#if defined(_WIN32) || defined(WIN32) -# define IMPORT __declspec(dllimport) -#else -# define IMPORT -#endif - -IMPORT void dynamic2_hello(); +DLL_IMPORT void dynamic2_hello(); void TestMe::hello() const { |