Port iOS WD on Qt 5.2.0

Author: Mykola Tryshnivskyy

build_ios.sh

@@ -3,21 +3,38 @@
 export QT_DIR=/usr/local/opt/qt5_ios
 export PATH=$QT_DIR/bin:$PATH
 
+cat > wd.gypi <<EOF
+{
+  'variables': 
+  {
+    'QT5': '1',
+    'QT_BIN_PATH':       '${QT_DIR}/bin',
+    'QT_INC_PATH':       '${QT_DIR}/include',
+    'QT_LIB_PATH':       '${QT_DIR}/lib',
+    'WD_CONFIG_WEBKIT':  '0',
+    'WD_CONFIG_QUICK':   '1',
+    'WD_CONFIG_PLAYER':  '1',
+    'WD_BUILD_MONGOOSE': '1',
+  },
+}
+EOF
+
 python generate_wdversion.py
 
 gyp --depth . -G output_dir=. -D platform=desktop -D mode=debug -f xcode -D OS=ios --generator-output=out/ wd.gyp
 
 if [ "$1" == "-all" ]
 then
 
-xcodebuild -project out/wd_test.xcodeproj -target test_ios_WD -arch i386 -sdk iphonesimulator clean build
-
-cd ./platform/ios/wd
-qmake wd.pro -r -spec unsupported/macx-iossimulator-clang CONFIG+=x86
-make -release
+#xcodebuild -project out/wd_test.xcodeproj -target test_ios_WD -arch i386 -sdk iphonesimulator #clean build
+xcodebuild -project out/base.xcodeproj -target chromium_base -arch i386 -sdk iphonesimulator clean build
+xcodebuild -project out/wd_core.xcodeproj -target WebDriver_core -arch i386 -sdk iphonesimulator clean build
+xcodebuild -project out/wd_ext_qt.xcodeproj -target WebDriver_extension_qt_base -arch i386 -sdk iphonesimulator clean build
+xcodebuild -project out/wd_ext_qt.xcodeproj -target WebDriver_extension_qt_quick -arch i386 -sdk iphonesimulator clean build
 
-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
+cd ./platform/ios/wd
+qmake wd.pro -r -spec macx-ios-clang CONFIG+=x86 CONFIG+=iphonesimulator CONFIG+=release
+make
 
 fi

platform/ios/wd/wd.pro

@@ -1,4 +1,4 @@
-QT       += core gui network
+QT       += core gui network widgets qml xml multimedia multimediawidgets quick
 
 SOURCES += \
     ../../../src/Test/shutdown_command.cc \
@@ -20,10 +20,9 @@ SOURCES += \
     ../../../src/Test/ClickScrollingTest.cc \
     ../../../src/Test/BasicMouseInterfaceTest.cc \
     ../../../src/Test/BasicKeyboardInterfaceTest.cc \
-    ../../../src/Test/VideoTest.cc \
     ../../../src/Test/TouchTest.cc \
     ../../../src/Test/MenuTest.cc \
-    ../../../src/Test/WindowWithDeclarativeViewTest.cc
+    #../../../src/Test/VideoTest.cc
 
 HEADERS += \
     ../../../src/Test/shutdown_command.h \
@@ -45,14 +44,12 @@ HEADERS += \
     ../../../src/Test/ClickScrollingTest.h \
     ../../../src/Test/BasicMouseInterfaceTest.h \
     ../../../src/Test/BasicKeyboardInterfaceTest.h \
-    ../../../src/Test/WindowWithDeclarativeViewTest.h \
-    ../../../src/Test/VideoTest.h \
     ../../../src/Test/TouchTest.h \
     ../../../src/Test/TestVariables.h \
-    ../../../src/Test/MenuTest.h
+    ../../../src/Test/MenuTest.h \
+    #../../../src/Test/VideoTest.h
 
 INCLUDEPATH += ../../../inc
-INCLUDEPATH += ../../../mocs
 
 FORMS += \
     ../../../src/Test/ElementSelectingTest.ui \
@@ -63,7 +60,17 @@ DESTDIR = build
 OBJECTS_DIR = build
 MOC_DIR = build
 
-ios: include($$[QT_HOST_DATA/get]/mkspecs/common/ios/qiosapp.conf)
+INCLUDEPATH += $$PWD/../../../build/Default-iphonesimulator
+DEPENDPATH += $$PWD/../../../build/Default-iphonesimulator
 
+LIBS += -L$$PWD/../../../build/Default-iphonesimulator/ -lchromium_base
+PRE_TARGETDEPS += $$PWD/../../../build/Default-iphonesimulator/libchromium_base.a
 
+LIBS += -L$$PWD/../../../build/Default-iphonesimulator/ -lWebDriver_core
+PRE_TARGETDEPS += $$PWD/../../../build/Default-iphonesimulator/libWebDriver_core.a
 
+LIBS += -L$$PWD/../../../build/Default-iphonesimulator/ -lWebDriver_extension_qt_base
+PRE_TARGETDEPS += $$PWD/../../../build/Default-iphonesimulator/libWebDriver_extension_qt_base.a
+
+LIBS += -L$$PWD/../../../build/Default-iphonesimulator/ -lWebDriver_extension_qt_quick
+PRE_TARGETDEPS += $$PWD/../../../build/Default-iphonesimulator/libWebDriver_extension_qt_quick.a

platform/ios/wd_qt5.gypi

@@ -1,11 +1,13 @@
 {
-  'variables': {
-    'QT5': '1', # change to '1' for enabling Qt5
+  'variables': 
+  {
+    'QT5': '1',
+    'QT_BIN_PATH':       '/usr/local/opt/qt5_ios/bin',
+    'QT_INC_PATH':       '/usr/local/opt/qt5_ios/include',
+    'QT_LIB_PATH':       '/usr/local/opt/qt5_ios/lib',
+    'WD_CONFIG_WEBKIT':  '0',
+    'WD_CONFIG_QUICK':   '1',
+    'WD_CONFIG_PLAYER':  '1',
     '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',
-    'INTERMEDIATE_DIR': 'mocs',
   },
 }