diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-03-02 10:55:08 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-03-02 11:17:40 +0000 |
| commit | d0bc04ede09002d6bda1798ec2f452caa99712b7 (patch) | |
| tree | 67cdaf16ead7e163ccc2a02c511dc2cef27ceaec /tests/auto/api | |
| parent | 00f77c9f2397f805e3a5cb8162fa7e458a47ff77 (diff) | |
Fix symbol import/export of link-dynamiclibs-staticlibs test
This fixes the test on Windows.
Change-Id: Idde05e5a216672b1b3d157df3de3d1fa17466613
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/api')
| -rw-r--r-- | tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic1.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/api/testdata/link-dynamiclibs-staticlibs/static1.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic1.cpp b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic1.cpp index 18842f105..aea063e29 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic1.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic1.cpp @@ -2,13 +2,11 @@ #if defined(_WIN32) || defined(WIN32) # define EXPORT __declspec(dllexport) -# define IMPORT __declspec(dllimport) #else # define EXPORT -# define IMPORT #endif -IMPORT void static1_hello(); +void static1_hello(); EXPORT int dynamic1_hello() { diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static1.cpp b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static1.cpp index 87b713757..1e67972dc 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static1.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static1.cpp @@ -1,16 +1,14 @@ #include <stdio.h> #if defined(_WIN32) || defined(WIN32) -# define EXPORT __declspec(dllexport) # define IMPORT __declspec(dllimport) #else -# define EXPORT __attribute__((visibility("default"))) # define IMPORT #endif IMPORT void dynamic2_hello(); -EXPORT void static1_hello() +void static1_hello() { dynamic2_hello(); puts("static1 says hello!"); |