Update iOS configuration

Author: build

build_ios.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export QT_DIR=/Developer/Qt4iOS/qt-everywhere-ios-5.1.0
+export QT_DIR=/usr/local/opt/qt5_ios
 export PATH=$QT_DIR/bin:$PATH
 
 python generate_wdversion.py
@@ -14,9 +14,9 @@ xcodebuild -project out/wd_test.xcodeproj -target test_ios_WD -arch i386 -sdk ip
 
 cd ./platform/ios/wd
 qmake wd.pro -r -spec unsupported/macx-iossimulator-clang CONFIG+=x86
-make -release	
-	
-cd ../wd_test	
+make -release
+
+cd ../wd_test
 
 xcodebuild -project wd_test.xcodeproj -alltargets -arch i386 -sdk iphonesimulator -configuration Debug ONLY_ACTIVE_ARCH=NO VALID_ARCHS="armv7 i386" clean build
 

platform/ios/wd_qt5.gypi

@@ -1,6 +1,8 @@
 {
   'variables': {
     'QT5': '1', # change to '1' for enabling Qt5
+    'WD_BUILD_MONGOOSE': '1',
+    'WD_CONFIG_PLAYER': '0',
     'QT_INC_PATH':    '/usr/local/opt/qt5_ios/include',
     'QT_LIB_PATH':    '/usr/local/opt/qt5_ios/lib',
     'QT_BIN_PATH':    '/usr/local/opt/qt5_ios/bin',

wd_build_options.gypi

@@ -28,7 +28,7 @@
         '-g',
       ],
     } ],
-     
+
     [ 'mode == "release"', {
       'cflags': [
         '-O3',
@@ -79,7 +79,7 @@
           '--sysroot=<!(/bin/echo -n $ANDROID_NDK_ROOT)/platforms/android-9/arch-<!(/bin/echo -n $ANDROID_ARCH)',
         ],
     } ],
-     
+
     [ 'OS == "win"', {
       'defines': [
          '_WIN32',
@@ -105,12 +105,12 @@
         'outputs':     [],
         'action':      ['mkdir', '-p', '<(INTERMEDIATE_DIR)'],
        } ],
-       
-      'defines': [ 
+
+      'defines': [
          'OS_POSIX',
       ],
 
-      'xcode_settings': {	
+      'xcode_settings': {
         'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
       },
     } ],

wd_test.gyp

@@ -82,10 +82,10 @@
                 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
                 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
               ],
-            }, 
-          } ], 
+            },
+          } ],
           ['OS=="android"', {
-            'libraries': [		
+            'libraries': [
               '-L<(QT_LIB_PATH)',
               '-lQt5Widgets',
               '-lQt5Network',
@@ -107,36 +107,27 @@
                 '<(QT_LIB_PATH)/libQt5Gui.a',
                 '<(QT_LIB_PATH)/libQt5Core.a',
                 '<(QT_LIB_PATH)/libQt5Widgets.a',
-                # Quick2 isn't supported in QT for iOS
-                #'<(QT_LIB_PATH)/libQt5Qml.a',
-                #'<(QT_LIB_PATH)/libQt5Quick.a',
+                '<(QT_LIB_PATH)/libQt5Qml.a',
+                '<(QT_LIB_PATH)/libQt5Quick.a',
                 '<(QT_LIB_PATH)/libQt5Xml.a',
-                #'<(QT_LIB_PATH)/libQt5MultimediaWidgets.a',
-                #'<(QT_LIB_PATH)/libQt5Multimedia.a',
-                #'<(QT_LIB_PATH)/libQt5V8.a',
-                #'<(QT_LIB_PATH)/libQt5XmlPatterns.a',
-                #'<(QT_LIB_PATH)/libQt5OpenGL.a',
-                #'<(QT_LIB_PATH)/libQt5OpenGLExtensions.a',
                 '<(QT_LIB_PATH)/libQt5PlatformSupport.a',
                 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
                 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
                 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
                 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
                 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
-                #'$(SDKROOT)/System/Library/Frameworks/OpenGLES.framework',
-                #'$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
                 'libz.dylib',
               ],
-            }, 
-     
+            },
+
             'xcode_settings': {
               'TARGETED_DEVICE_FAMILY': '1,2',
               'CODE_SIGN_IDENTITY': 'iPhone Developer',
               'IPHONEOS_DEPLOYMENT_TARGET': '6.1',
               'ARCHS': '$(ARCHS_STANDARD_32_BIT)',
               'CLANG_WARN_CXX0X_EXTENSIONS': 'NO',
             },
-          } ],      
+          } ],
         ],
       }, {
         'conditions': [