diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-02-09 07:48:04 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-02-09 18:30:34 +0000 |
| commit | a931d0799b46123422582635b79d217eee0ae6bd (patch) | |
| tree | 1d41422d0b3dde57d0f598b5219e5d8e6d3d4d70 /tests | |
| parent | 231ca3adc48d1980b9cd14840df832a72d642e79 (diff) | |
Fix platform conditions across entire modulev5.9.0-alpha1
Change-Id: Id63420244eecd5935b7fa7c82b6ad9e0e48ad0f1
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/macfunctions/macfunctions.pro | 2 | ||||
| -rw-r--r-- | tests/auto/macfunctions/tst_qmacfunctions.mm | 5 | ||||
| -rw-r--r-- | tests/tests.pro | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/macfunctions/macfunctions.pro b/tests/auto/macfunctions/macfunctions.pro index b13227a..9a605d9 100644 --- a/tests/auto/macfunctions/macfunctions.pro +++ b/tests/auto/macfunctions/macfunctions.pro @@ -3,4 +3,4 @@ CONFIG -= app_bundle TARGET = tst_qmacfunctions QT += macextras widgets testlib OBJECTIVE_SOURCES += tst_qmacfunctions.mm -LIBS += -framework AppKit +macos: LIBS += -framework AppKit diff --git a/tests/auto/macfunctions/tst_qmacfunctions.mm b/tests/auto/macfunctions/tst_qmacfunctions.mm index e8e04a7..cd1d304 100644 --- a/tests/auto/macfunctions/tst_qmacfunctions.mm +++ b/tests/auto/macfunctions/tst_qmacfunctions.mm @@ -25,7 +25,6 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#import <AppKit/AppKit.h> #include <QString> #include <QtTest> @@ -35,6 +34,10 @@ #include <QtWidgets/QMainWindow> #include <qmacfunctions.h> +#ifdef Q_OS_MACOS +#import <AppKit/AppKit.h> +#endif + class tst_QMacFunctions : public QObject { Q_OBJECT diff --git a/tests/tests.pro b/tests/tests.pro index 77383dc..7fbc8a9 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -macx:!ios:SUBDIRS = auto +SUBDIRS = auto |