Merge branch 'WD_1.X_dev' of https://portal-ua.globallogic.com/git/wd into WD_1.X_dev

Author: Mykola Tryshnivskyy

platform/mac/wd_qt4.8.5.gypi

@@ -1,9 +1,9 @@
 {
   'variables': {
     'QT5': '0', # change to '1' for enabling Qt5
-    'DESKTOP_QT_BIN_PATH': '/usr/local/Trolltech/Qt-4.8.5/bin',
-    'DESKTOP_QT_INC_PATH': '/usr/local/qt-4.8.5/include',
-    'DESKTOP_QT_LIB_PATH': '/usr/local/Trolltech/Qt-4.8.5/lib',
+    'QT_BIN_PATH': '/usr/local/Trolltech/Qt-4.8.5/bin',
+    'QT_INC_PATH': '/usr/local/Trolltech/Qt-4.8.5/include',
+    'QT_LIB_PATH': '/usr/local/Trolltech/Qt-4.8.5/lib',
     'INTERMEDIATE_DIR': 'mocs',
   },
 }

wd_test.gyp

@@ -173,36 +173,18 @@
           [ 'OS=="mac"', {
             'link_settings': {
               'libraries': [
-                '<(QT_LIB_PATH)/QtGui.framework',
-                '<(QT_LIB_PATH)/QtCore.framework',
-                '<(QT_LIB_PATH)/QtNetwork.framework',
-                '<(QT_LIB_PATH)/QtDeclarative.framework',
-                '<(QT_LIB_PATH)/QtXml.framework',
+                '<(QT_LIB_PATH)/libQtGui.a',
+                '<(QT_LIB_PATH)/libQtCore.a',
+                '<(QT_LIB_PATH)/libQtNetwork.a',
+                '<(QT_LIB_PATH)/libQtDeclarative.a',
+                '<(QT_LIB_PATH)/libQtXml.a',
                 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
                 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
                 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
                 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
               ],
             },
           } ],
-          [ 'OS=="ios"', {
-            'link_settings': {
-              'libraries': [
-                '<(QT_LIB_PATH)/QtGui.framework',
-                '<(QT_LIB_PATH)/QtCore.framework',
-                '<(QT_LIB_PATH)/QtNetwork.framework',
-                '<(QT_LIB_PATH)/QtDeclarative.framework',
-                #'<(QT_LIB_PATH)/../plugins/platforms/libqios.a',
-                '<(QT_LIB_PATH)/../plugins/platforms/libcruikit.a',
-                '/Developer/Qt4iOS/ios-qml/IOSPluginLibs/ios-clang-release/lib/libqmlcomponectsios.a',
-                '<(SDK_ROOT)/System/Library/Frameworks/Foundation.framework',
-                '<(SDK_ROOT)/System/Library/Frameworks/CoreFoundation.framework',
-                '<(SDK_ROOT)/System/Library/Frameworks/CoreGraphics.framework',
-                '<(SDK_ROOT)/System/Library/Frameworks/CoreText.framework',
-                '<(SDK_ROOT)/System/Library/Frameworks/UIKit.framework',
-              ],
-            },
-          } ],
         ],
       } ],
     ], # conditions
@@ -326,7 +308,7 @@
             } ],
             [ 'OS=="mac" or OS=="ios"', {
               'link_settings': {
-                'libraries': ['<(QT_LIB_PATH)/QtWebKit.framework',],
+                'libraries': ['<(QT_LIB_PATH)/libQtWebKit.a',],
               },
             } ],
           ],