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 /src/macextras | |
| 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 'src/macextras')
| -rw-r--r-- | src/macextras/macextras-lib.pri | 68 | ||||
| -rw-r--r-- | src/macextras/qmacfunctions.h | 4 |
2 files changed, 36 insertions, 36 deletions
diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri index 2ce4f05..eac6ad9 100644 --- a/src/macextras/macextras-lib.pri +++ b/src/macextras/macextras-lib.pri @@ -1,41 +1,41 @@ INCLUDEPATH += $$PWD -mac { +PUBLIC_HEADERS += \ + $$PWD/qmacfunctions.h \ + +PRIVATE_HEADERS += $$PWD/qmacfunctions_p.h +OBJECTIVE_SOURCES += $$PWD/qmacfunctions.mm + +uikit:!watchos { + OBJECTIVE_SOURCES += \ + $$PWD/qmacfunctions_ios.mm + + LIBS_PRIVATE += -framework UIKit +} + +macos { PUBLIC_HEADERS += \ - $$PWD/qmacfunctions.h \ - - PRIVATE_HEADERS += $$PWD/qmacfunctions_p.h - OBJECTIVE_SOURCES += $$PWD/qmacfunctions.mm - - ios { - OBJECTIVE_SOURCES += \ - $$PWD/qmacfunctions_ios.mm - - LIBS_PRIVATE += -framework UIKit - } else { - PUBLIC_HEADERS += \ - $$PWD/qmactoolbar.h \ - $$PWD/qmactoolbaritem.h \ - - PRIVATE_HEADERS += \ - $$PWD/qmactoolbar_p.h \ - $$PWD/qmactoolbardelegate_p.h \ - $$PWD/qnstoolbar_p.h - - OBJECTIVE_SOURCES += \ - $$PWD/qmacfunctions_mac.mm \ - $$PWD/qmactoolbar.mm \ - $$PWD/qmactoolbaritem.mm \ - $$PWD/qmactoolbardelegate.mm \ - $$PWD/qnstoolbar.mm - - greaterThan(QT_MAJOR_VERSION, 4) { - PUBLIC_HEADERS += $$PWD/qmacpasteboardmime.h - OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm - } - - LIBS_PRIVATE += -framework AppKit + $$PWD/qmactoolbar.h \ + $$PWD/qmactoolbaritem.h \ + + PRIVATE_HEADERS += \ + $$PWD/qmactoolbar_p.h \ + $$PWD/qmactoolbardelegate_p.h \ + $$PWD/qnstoolbar_p.h + + OBJECTIVE_SOURCES += \ + $$PWD/qmacfunctions_mac.mm \ + $$PWD/qmactoolbar.mm \ + $$PWD/qmactoolbaritem.mm \ + $$PWD/qmactoolbardelegate.mm \ + $$PWD/qnstoolbar.mm + + greaterThan(QT_MAJOR_VERSION, 4) { + PUBLIC_HEADERS += $$PWD/qmacpasteboardmime.h + OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm } + + LIBS_PRIVATE += -framework AppKit } HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h index 6d52cf5..ccdbd6e 100644 --- a/src/macextras/qmacfunctions.h +++ b/src/macextras/qmacfunctions.h @@ -85,10 +85,10 @@ Q_MACEXTRAS_EXPORT bool isMainWindow(QWindow *window); #endif #endif // Q_OS_OSX -#ifdef Q_OS_IOS +#if defined(QT_PLATFORM_UIKIT) && !defined(Q_OS_WATCHOS) Q_MACEXTRAS_EXPORT void setApplicationIconBadgeNumber(int number) __attribute__((availability(ios_app_extension,unavailable))); Q_MACEXTRAS_EXPORT int applicationIconBadgeNumber() __attribute__((availability(ios_app_extension,unavailable))); -#endif // Q_OS_IOS +#endif // defined(QT_PLATFORM_UIKIT) && !defined(Q_OS_WATCHOS) } QT_END_NAMESPACE |