diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-23 16:15:36 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-01-09 10:11:48 +0000 |
| commit | 6b7e6332484df1d16ad539631685687f76f86159 (patch) | |
| tree | 721b4b8fadc18d690aa8df0bcf81662485d2b2b6 /src/plugins | |
| parent | 747e569597348b47a9d2cbb469eb5c4af87f7ff2 (diff) | |
Remove compatibility code paths for macOS < 10.10 and iOS < 8.0
Change-Id: I11bec0efc2b4d86adf64a58990260fee70f050ac
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/images/leopard-unified-toolbar-on.png | bin | 356 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaresources.qrc | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosscreen.mm | 7 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/platforms/cocoa/images/leopard-unified-toolbar-on.png b/src/plugins/platforms/cocoa/images/leopard-unified-toolbar-on.png Binary files differdeleted file mode 100644 index 6716597046..0000000000 --- a/src/plugins/platforms/cocoa/images/leopard-unified-toolbar-on.png +++ /dev/null diff --git a/src/plugins/platforms/cocoa/qcocoaresources.qrc b/src/plugins/platforms/cocoa/qcocoaresources.qrc index 4255bfba9d..b06ab65ea8 100644 --- a/src/plugins/platforms/cocoa/qcocoaresources.qrc +++ b/src/plugins/platforms/cocoa/qcocoaresources.qrc @@ -6,7 +6,4 @@ <file>images/waitcursor.png</file> <file>images/sizeallcursor.png</file> </qresource> -<qresource prefix="/qt-project.org/mac/style"> -<file>images/leopard-unified-toolbar-on.png</file> -</qresource> </RCC> diff --git a/src/plugins/platforms/ios/qiosscreen.mm b/src/plugins/platforms/ios/qiosscreen.mm index 49268ee076..3514bf63bb 100644 --- a/src/plugins/platforms/ios/qiosscreen.mm +++ b/src/plugins/platforms/ios/qiosscreen.mm @@ -407,10 +407,11 @@ qreal QIOSScreen::devicePixelRatio() const Qt::ScreenOrientation QIOSScreen::nativeOrientation() const { CGRect nativeBounds = -#if !defined(Q_OS_TVOS) && QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_8_0) - QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::IOS, 8) ? m_uiScreen.nativeBounds : -#endif +#if defined(Q_OS_IOS) + m_uiScreen.nativeBounds; +#else m_uiScreen.bounds; +#endif // All known iOS devices have a native orientation of portrait, but to // be on the safe side we compare the width and height of the bounds. |
