From 57378a108ca488cbf5cfaa32590fc762dcbf3315 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Thu, 19 May 2016 23:01:59 -0700
Subject: Add support for Apple watchOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I3f9e00569458a463af2eaa5a3a16a6afd1e9c1ea
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
---
 .../fontdatabases/fontdatabases.pri                | 25 +++++++++++-----------
 src/platformsupport/fontdatabases/mac/coretext.pri |  2 +-
 .../fontdatabases/mac/qcoretextfontdatabase.mm     |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/fontdatabases/fontdatabases.pri b/src/platformsupport/fontdatabases/fontdatabases.pri
index 0ef46d0a1c..f8e51f2a6d 100644
--- a/src/platformsupport/fontdatabases/fontdatabases.pri
+++ b/src/platformsupport/fontdatabases/fontdatabases.pri
@@ -1,16 +1,15 @@
-!win32|qtConfig(freetype):!darwin {
-    include($$PWD/basic/basic.pri)
-}
-
-unix:!mac {
-    CONFIG += qpa/genericunixfontdatabase
-    include($$PWD/genericunix/genericunix.pri)
-    qtConfig(fontconfig) {
-        include($$PWD/fontconfig/fontconfig.pri)
+darwin:!if(watchos:CONFIG(simulator, simulator|device)) {
+    include($$PWD/mac/coretext.pri)
+} else {
+    !win32|qtConfig(freetype) {
+        include($$PWD/basic/basic.pri)
     }
-}
 
-mac {
-    include($$PWD/mac/coretext.pri)
+    unix {
+        CONFIG += qpa/genericunixfontdatabase
+        include($$PWD/genericunix/genericunix.pri)
+        contains(QT_CONFIG,fontconfig) {
+            include($$PWD/fontconfig/fontconfig.pri)
+        }
+    }
 }
-
diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri
index 4140b64b22..4d19a59226 100644
--- a/src/platformsupport/fontdatabases/mac/coretext.pri
+++ b/src/platformsupport/fontdatabases/mac/coretext.pri
@@ -8,7 +8,7 @@ qtConfig(freetype) {
 }
 
 uikit: \
-    # On iOS/tvOS CoreText and CoreGraphics are stand-alone frameworks
+    # On iOS/tvOS/watchOS CoreText and CoreGraphics are stand-alone frameworks
     LIBS_PRIVATE += -framework CoreText -framework CoreGraphics
 else: \
     # On Mac OS they are part of the ApplicationServices umbrella framework,
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 5fec53d1ed..6b73134c8b 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -811,7 +811,7 @@ static CTFontDescriptorRef fontDescriptorFromTheme(QPlatformTheme::Font f)
         UIFontDescriptor *desc = [UIFontDescriptor preferredFontDescriptorWithTextStyle:textStyle];
         return static_cast<CTFontDescriptorRef>(CFBridgingRetain(desc));
     }
-#endif // Q_OS_IOS, Q_OS_TVOS
+#endif // Q_OS_IOS, Q_OS_TVOS, Q_OS_WATCHOS
 
     // OSX default case and iOS fallback case
     CTFontUIFontType fontType = fontTypeFromTheme(f);
-- 
cgit v1.2.3