Additions to OneQt for iOS/iPad use.

Changes font sizes to fit iPad screen resolution, adds custom Info.plist
for iOS and all the icon variants.

Change-Id: I67c29d4cc87305c82f726f7190283a3c28cbaf7e
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>

20 files changed, 91 insertions, 4 deletions

diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml b/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml
index acd0b9e..f35a950 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml
@@ -95,7 +95,7 @@ Item {
             id: heading1
             text: ""
             font.family: "Helvetica"
-            font.pixelSize: 3.125 * 16
+            font.pixelSize: 3.0 * 16
             font.weight: Font.Light
             color: "black"
 
@@ -105,7 +105,7 @@ Item {
                 anchors.left: heading1.right
                 text: ""
                 font.family: "Helvetica"
-                font.pixelSize: 3.125 * 16
+                font.pixelSize: 3.0 * 16
                 font.weight: Font.Light
                 color: "#5caa15"
             }
@@ -121,6 +121,7 @@ Item {
         Text {
             id: description
             text: ""
+            width: (infoSheet.width - infoSheet.anchors.leftMargin) * 0.3
             font.family: "Helvetica"
             font.pixelSize: 16
             font.weight: Font.Light
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml b/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml
index 94a85f0..ca9b02b 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml
@@ -106,13 +106,13 @@ Text {
                 }
     }
 
-
     MouseArea {
-        id: mouseArea1
+        id: mouseArea
         anchors.fill: parent
         hoverEnabled: true
 
         onPressed: {
+            menubarItem.state = "mouseover";
         }
 
         onReleased: {
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/Info.plist b/examples/canvas3d/canvas3d/threejs/oneqt/ios/Info.plist
new file mode 100644
index 0000000..192ea0d
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/Info.plist
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleIconFile</key>
+    <string></string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleGetInfoString</key>
+    <string>Created by Qt/QMake</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleExecutable</key>
+    <string>oneqt</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.theqtcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+    <key>CFBundleDisplayName</key>
+    <string>One Qt</string>
+    <key>CFBundleName</key>
+    <string>${PRODUCT_NAME}</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleVersion</key>
+    <string>1.0</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>UILaunchStoryboardName</key>
+    <string>LaunchScreen</string>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+
+<key>CFBundleIcons</key>
+<dict>
+    <key>CFBundlePrimaryIcon</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>OneQtIcon29x29.png</string>
+            <string>OneQtIcon29x29@2x.png</string>
+            <string>OneQtIcon40x40@2x.png</string>
+            <string>OneQtIcon57x57.png</string>
+            <string>OneQtIcon57x57@2x.png</string>
+            <string>OneQtIcon60x60@2x.png</string>
+        </array>
+    </dict>
+</dict>
+
+<key>CFBundleIcons~ipad</key>
+<dict>
+    <key>CFBundlePrimaryIcon</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>OneQtIcon29x29.png</string>
+            <string>OneQtIcon29x29@2x.png</string>
+            <string>OneQtIcon40x40@2x.png</string>
+            <string>OneQtIcon57x57.png</string>
+            <string>OneQtIcon57x57@2x.png</string>
+            <string>OneQtIcon60x60@2x.png</string>
+            <string>OneQtIcon29x29~ipad.png</string>
+            <string>OneQtIcon29x29@2x~ipad.png</string>
+            <string>OneQtIcon40x40~ipad.png</string>
+            <string>OneQtIcon40x40@2x~ipad.png</string>
+            <string>OneQtIcon50x50~ipad.png</string>
+            <string>OneQtIcon50x50@2x~ipad.png</string>
+            <string>OneQtIcon72x72~ipad.png</string>
+            <string>OneQtIcon72x72@2x~ipad.png</string>
+            <string>OneQtIcon76x76~ipad.png</string>
+            <string>OneQtIcon76x76@2x~ipad.png</string>
+        </array>
+    </dict>
+</dict>
+</dict>
+
+</plist>
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29.png
new file mode 100644
index 0000000..3679329
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x.png
new file mode 100644
index 0000000..6beb7ef
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x~ipad.png
new file mode 100644
index 0000000..6beb7ef
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29~ipad.png
new file mode 100644
index 0000000..3679329
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x.png
new file mode 100644
index 0000000..e764582
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x~ipad.png
new file mode 100644
index 0000000..e764582
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40~ipad.png
new file mode 100644
index 0000000..b3eaba6
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50@2x~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50@2x~ipad.png
new file mode 100644
index 0000000..8bf885b
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50~ipad.png
new file mode 100644
index 0000000..126359d
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57.png
new file mode 100644
index 0000000..d0f396f
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57@2x.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57@2x.png
new file mode 100644
index 0000000..7fab49b
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon60x60@2x.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon60x60@2x.png
new file mode 100644
index 0000000..d594419
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon60x60@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72@2x~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72@2x~ipad.png
new file mode 100644
index 0000000..f68d8ea
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72~ipad.png
new file mode 100644
index 0000000..0450da8
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76@2x~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76@2x~ipad.png
new file mode 100644
index 0000000..9d9c2dc
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76~ipad.png b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76~ipad.png
new file mode 100644
index 0000000..d86c9b2
--- /dev/null
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro b/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro
index 96515f0..6860e26 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro
@@ -15,3 +15,9 @@ RESOURCES += oneqt.qrc
 
 DISTFILES += \
     ImageCube.qml
+
+ios {
+    ios_icon.files = $$files($$PWD/ios/OneQtIcon*.png)
+    QMAKE_BUNDLE_DATA += ios_icon
+    QMAKE_INFO_PLIST = ios/Info.plist
+}