0023701: Add Cocoa support to Qt samples

Adapted Qt samples for using Cocoa on Mac OS X

samples/qt/IESample/IESample.pro

@@ -30,9 +30,13 @@ unix {
 	OBJECTS_DIR = ./$$UNAME/obj
 	MOC_DIR = ./$$UNAME/src
     }
-    INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
-    DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
-    LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+
+    MACOSX_USE_GLX = $$(MACOSX_USE_GLX)
+
+    !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
+    !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
+    DEFINES += OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
+    !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
     LIBS += -lfreeimageplus
     LIBS += -ltbb -ltbbmalloc
 }

samples/qt/IESample/make.sh

@@ -4,4 +4,6 @@ export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
 cd $aSamplePath
 qmake IESample.pro
-make
+if test `uname -s` != "Darwin"; then
+  make
+fi

samples/qt/IESample/run.sh

@@ -8,7 +8,17 @@ host=`uname -s`
 STATION=$host
 
 RES_DIR="${aSamplePath}/res"
-BIN_DIR="${aSamplePath}/${STATION}/bin"
+
+aSystem=`uname -s`
+if [ "$aSystem" == "Darwin" ]; then
+  if [ "${CASDEB}" == "d" ]; then
+    BIN_DIR="${aSamplePath}/build/Debug/IESample.app/Contents/MacOS"
+  else
+    BIN_DIR="${aSamplePath}/build/Release/IESample.app/Contents/MacOS"
+  fi
+else
+  BIN_DIR="${aSamplePath}/${STATION}/bin${CASDEB}"
+fi
 
 CSF_ResourcesDefaults="${RES_DIR}"
 CSF_IEResourcesDefaults="${RES_DIR}"
@@ -19,9 +29,13 @@ export CSF_IEResourcesDefaults CSF_ResourcesDefaults
 export PATH
 
 if test ! -r "${BIN_DIR}/IESample"; then
-   echo "Executable \"${BIN_DIR}/IESample\" not found."
-   echo "Probably you don't compile the application. Execute \"make\"."
-   exit 1
+  echo "Executable \"${BIN_DIR}/IESample\" not found."
+  if [ "$aSystem" == "Darwin" ]; then
+    echo "Probably you don't compile the application. Build it with Xcode."
+  else
+    echo "Probably you don't compile the application. Execute \"make\"."
+  fi
+  exit 1
 fi
 
 ${BIN_DIR}/IESample