0026739: Problem with generate Qt samples

Generation of project files was fixed.

diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx
index 929a6c0a7b2747eb73bb03ce09abcb6416b44b6c..4eca6970c486740dec237f47838c88f229ccc8a6 100755 (executable)
--- a/samples/qt/Common/src/View.cxx
+++ b/samples/qt/Common/src/View.cxx
@@ -30,7 +30,6 @@
 #include <GL/glx.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
-#include <X11/Xmu/StdCmap.h>
 #include <X11/Xlib.h>
 #include <Xw_Window.hxx>
 #include <QColormap>

diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro
index e2faac4a49676f39287433dacc55ed7cd5fcd9a8..433524fab5b256b9a6f5e2cc4df60b6825122dc4 100755 (executable)
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -3,7 +3,7 @@ CONFIG += debug_and_release qt
 
 TARGET = IESample
 
-SAMPLESROOT = $$(SAMPLESROOT)
+SAMPLESROOT = $$quote($$(CASROOT)/samples/qt)
 
 HEADERS   = $${SAMPLESROOT}/Common/src/*.h \
             $${SAMPLESROOT}/Interface/src/*.h
@@ -22,6 +22,7 @@ RES_DIR   = $$quote($$(RES_DIR))
 
 INCLUDEPATH += $$quote($${SAMPLESROOT}/Common/src)
 INCLUDEPATH += $$quote($${SAMPLESROOT}/Interface/src)
+INCLUDEPATH += $$quote($$(CASROOT)/inc)
 
 OCCT_DEFINES = $$(CSF_DEFINES)
 
@@ -29,21 +30,18 @@ DEFINES = $$split(OCCT_DEFINES, ;)
 
 unix {
     UNAME = $$system(uname -s)
-    INCLUDES = $$(CSF_OPT_INC)
-    PATHS = $$split(INCLUDES,":")
-    for(path, PATHS):INCLUDEPATH += $${path}
     LIBLIST = $$(LD_LIBRARY_PATH)
     LIBPATHS = $$split(LIBLIST,":")
     for(lib, LIBPATHS):LIBS += -L$${lib}
 
     CONFIG(debug, debug|release) {
-       DESTDIR = ./$$UNAME/bind
-       OBJECTS_DIR = ./$$UNAME/objd
-       MOC_DIR = ./$$UNAME/mocd
+        DESTDIR = ./$$UNAME/bind
+        OBJECTS_DIR = ./$$UNAME/objd
+        MOC_DIR = ./$$UNAME/mocd
     } else {
-       DESTDIR = ./$$UNAME/bin
-       OBJECTS_DIR = ./$$UNAME/obj
-       MOC_DIR = ./$$UNAME/moc
+        DESTDIR = ./$$UNAME/bin
+        OBJECTS_DIR = ./$$UNAME/obj
+        MOC_DIR = ./$$UNAME/moc
     }
 
     MACOSX_USE_GLX = $$(MACOSX_USE_GLX)
@@ -55,33 +53,22 @@ unix {
     !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
+    QMAKE_CXXFLAGS += -std=gnu++11
 }
 
 win32 {
-    INCLUDES = $$(CSF_OPT_INC)
-    PATHS = $$split(INCLUDES,";")
-    for(path, PATHS):INCLUDEPATH += $${path}
-
     CONFIG(debug, debug|release) {
-       DEFINES += _DEBUG
-       DESTDIR = ./win$(ARCH)/$(VCVER)/bind
-       OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
-       MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
-       !contains(QMAKE_HOST.arch, x86_64) {
-           LIBS = -L$(CSF_OPT_LIB32D)
-       } else {
-           LIBS = -L$(CSF_OPT_LIB64D)
-       }
+        DEFINES += _DEBUG
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bind
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
+        MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
+        LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
     } else {
-       DEFINES += NDEBUG
-       DESTDIR = ./win$(ARCH)/$(VCVER)/bin
-       OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
-       MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
-       !contains(QMAKE_HOST.arch, x86_64) {
-           LIBS = -L$(CSF_OPT_LIB32)
-       } else {
-           LIBS = -L$(CSF_OPT_LIB64)
-       }
+        DEFINES += NDEBUG
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bin
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
+        MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
+        LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
     }
     DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }

diff --git a/samples/qt/IESample/custom.bat b/samples/qt/IESample/custom.bat
new file mode 100644 (file)
index 0000000..4597f54
--- /dev/null
+++ b/samples/qt/IESample/custom.bat
@@ -0,0 +1,4 @@
+@echo off
+rem Define QT_DIR variables in order to load OCCT environment
+
+set "QT_DIR="

diff --git a/samples/qt/IESample/custom.sh b/samples/qt/IESample/custom.sh
index 7442d2290f69c17d6011023494d47fe89a084714..9a6500928ef798a397c9384af1f21dc80cdf373e 100755 (executable)
--- a/samples/qt/IESample/custom.sh
+++ b/samples/qt/IESample/custom.sh
@@ -1,10 +1,4 @@
-#!/bin/sh
+#!/bin/bash
+#Define QT_DIR variables in order to generate Makefile files by qmake
 
-#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake.
-#If you are using Mac OS X it is necessary to define WOKHOME as a path to your WOK installation directory.
-
-export CASROOT=""
-
-export QTDIR=""
-
-export WOKHOME=""
+export QT_DIR=""

diff --git a/samples/qt/IESample/env.bat b/samples/qt/IESample/env.bat
index 3e498065a9051bf06a4dcd505ea9867fc1cddc3a..6d50198a83fb28503627287c38447d8752d5aa5c 100755 (executable)
--- a/samples/qt/IESample/env.bat
+++ b/samples/qt/IESample/env.bat
@@ -1,6 +1,11 @@
+@echo off
+
+call "custom.bat" %1 %2 %3
+
 call "%~dp0..\..\..\env.bat" %1 %2 %3
 
-SET "SAMPLESROOT=%~dp0.."
-SET "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
-SET "CSF_ResourcesDefaults=%RES_DIR%"
-SET "CSF_IEResourcesDefaults=%RES_DIR%"
+set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
+set "CSF_ResourcesDefaults=%RES_DIR%"
+set "CSF_IEResourcesDefaults=%RES_DIR%"
+
+set "PATH=%QT_DIR%/bin;%PATH%"

diff --git a/samples/qt/IESample/env.sh b/samples/qt/IESample/env.sh
index dcc2990425f4108126495ffa50ae572d498fa963..e26767091f671304553509a62cc17f94b26485c4 100755 (executable)
--- a/samples/qt/IESample/env.sh
+++ b/samples/qt/IESample/env.sh
@@ -1,19 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
-if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/custom.sh"; fi
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-if test "${CASROOT}" == ""; then
-   echo "Environment variable \"CASROOT\" not defined. Define it in \"custom.sh\" script."
-   exit 1
+if [ -e "custom.sh" ]; then
+   source "custom.sh";
 fi
 
-if test "${QTDIR}" == ""; then
-   echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script."
-   exit 1
+if [ -e "${aSamplePath}/../../../env.sh" ]; then
+   source "${aSamplePath}/../../../env.sh";
 fi
 
-if test `uname -s` == "Darwin" && test "${WOKHOME}" == ""; then
-   echo "Environment variable \"WOKHOME\" not defined. Define it in \"custom.sh\" script."
+if test "${QT_DIR}" == ""; then
+   echo "Environment variable \"QT_DIR\" not defined. Define it in \"custom.sh\" script."
    exit 1
 fi
 
@@ -21,7 +19,4 @@ host=`uname -s`
 export STATION=$host
 export RES_DIR=${aSamplePath}/${STATION}/res
 
-export PATH=${QTDIR}/bin:${PATH}
-
-source $CASROOT/env.sh
-export CSF_OPT_INC="${CASROOT}/inc:${WOKHOME}/lib:${CSF_OPT_INC}"
+export PATH=${QT_DIR}/bin:${PATH}

diff --git a/samples/qt/IESample/genproj.bat b/samples/qt/IESample/genproj.bat
index 8ac891a16e26337eaf5eacc43c3122834cb835ca..b65650fe275d6bb8bbc74c47e2112e159d033539 100644 (file)
--- a/samples/qt/IESample/genproj.bat
+++ b/samples/qt/IESample/genproj.bat
@@ -1,5 +1,6 @@
+@echo off
 REM Generation of vcproj files with qmake utilite
-REM Variable QTDIR and PATH to qmake executable must be defined without fail
+REM Variable QT_DIR and PATH to qmake executable must be defined without fail
 
 REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)

diff --git a/samples/qt/IESample/make.sh b/samples/qt/IESample/make.sh
index 4e56b6c4f9263a4fb5c8ccd5ef027b2db133e5a8..ef84e31e77c14127075a86cb46bf6a6db9d62ffa 100755 (executable)
--- a/samples/qt/IESample/make.sh
+++ b/samples/qt/IESample/make.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi

diff --git a/samples/qt/IESample/run.bat b/samples/qt/IESample/run.bat
index 0c1b69fd263b53d652a96fa64d6f7c1b79c306cf..9117b5ea0353fe4af04cea69cd7ab32839a9432d 100644 (file)
--- a/samples/qt/IESample/run.bat
+++ b/samples/qt/IESample/run.bat
@@ -1,8 +1,7 @@
 call "%~dp0env.bat" %1 %2 %3
 
 set "BIN_DIR=win%ARCH%\%VCVER%\bind"
-
-IF ["%CASDEB%"] == [""] (
+if ["%CASDEB%"] == [""] (
   set "BIN_DIR=win%ARCH%\%VCVER%\bin"
 )
 

diff --git a/samples/qt/IESample/run.sh b/samples/qt/IESample/run.sh
index d9d8d2aceff8207532b51be60787dd912ef49a63..a9374a31338b01ebee5e81115a2889755da87406 100755 (executable)
--- a/samples/qt/IESample/run.sh
+++ b/samples/qt/IESample/run.sh
@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
 cd $aSamplePath
 

diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro
index 2dfd90e012332272124a78fa8e62b44c7fc796b2..dd66bb4881c308b4ddc995689700eef67d9a854a 100755 (executable)
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -3,7 +3,7 @@ CONFIG += debug_and_release qt
 
 TARGET = Tutorial
 
-SAMPLESROOT = $$(SAMPLESROOT)
+SAMPLESROOT = $$quote($$(CASROOT)/samples/qt)
 
 HEADERS   = src/*.h \
             $${SAMPLESROOT}/Common/src/*.h \
@@ -25,6 +25,7 @@ RES_DIR   = $$quote($$(RES_DIR))
 
 INCLUDEPATH += $$quote($${SAMPLESROOT}/Common/src)
 INCLUDEPATH += $$quote($${SAMPLESROOT}/Interface/src)
+INCLUDEPATH += $$quote($$(CASROOT)/inc)
 
 OCCT_DEFINES = $$(CSF_DEFINES)
 
@@ -32,21 +33,18 @@ DEFINES = $$split(OCCT_DEFINES, ;)
 
 unix {
     UNAME = $$system(uname -s)
-    INCLUDES = $$(CSF_OPT_INC)
-    PATHS = $$split(INCLUDES,":")
-    for(path, PATHS):INCLUDEPATH += $${path}
     LIBLIST = $$(LD_LIBRARY_PATH)
     LIBPATHS = $$split(LIBLIST,":")
     for(lib, LIBPATHS):LIBS += -L$${lib}
 
     CONFIG(debug, debug|release) {
-       DESTDIR = ./$$UNAME/bind
-       OBJECTS_DIR = ./$$UNAME/objd
-       MOC_DIR = ./$$UNAME/mocd
+        DESTDIR = ./$$UNAME/bind
+        OBJECTS_DIR = ./$$UNAME/objd
+        MOC_DIR = ./$$UNAME/mocd
     } else {
-       DESTDIR = ./$$UNAME/bin
-       OBJECTS_DIR = ./$$UNAME/obj
-       MOC_DIR = ./$$UNAME/moc
+        DESTDIR = ./$$UNAME/bin
+        OBJECTS_DIR = ./$$UNAME/obj
+        MOC_DIR = ./$$UNAME/moc
     }
 
     MACOSX_USE_GLX = $$(MACOSX_USE_GLX)
@@ -58,33 +56,22 @@ unix {
     !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
+    QMAKE_CXXFLAGS += -std=gnu++11
 }
 
 win32 {
-    INCLUDES = $$(CSF_OPT_INC)
-    PATHS = $$split(INCLUDES,";")
-    for(path, PATHS):INCLUDEPATH += $${path}
-
     CONFIG(debug, debug|release) {
-       DEFINES += _DEBUG
-       DESTDIR = ./win$(ARCH)/$(VCVER)/bind
-       OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
-       MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
-       !contains(QMAKE_HOST.arch, x86_64) {
-           LIBS = -L$(CSF_OPT_LIB32D)
-       } else {
-           LIBS = -L$(CSF_OPT_LIB64D)
-       }
+        DEFINES += _DEBUG
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bind
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
+        MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
+        LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
     } else {
-       DEFINES += NDEBUG
-       DESTDIR = ./win$(ARCH)/$(VCVER)/bin
-       OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
-       MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
-       !contains(QMAKE_HOST.arch, x86_64) {
-           LIBS = -L$(CSF_OPT_LIB32)
-       } else {
-           LIBS = -L$(CSF_OPT_LIB64)
-       }
+        DEFINES += NDEBUG
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bin
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
+        MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
+        LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
     }
     DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }

diff --git a/samples/qt/Tutorial/custom.bat b/samples/qt/Tutorial/custom.bat
new file mode 100644 (file)
index 0000000..4597f54
--- /dev/null
+++ b/samples/qt/Tutorial/custom.bat
@@ -0,0 +1,4 @@
+@echo off
+rem Define QT_DIR variables in order to load OCCT environment
+
+set "QT_DIR="

diff --git a/samples/qt/Tutorial/custom.sh b/samples/qt/Tutorial/custom.sh
index 7442d2290f69c17d6011023494d47fe89a084714..9a6500928ef798a397c9384af1f21dc80cdf373e 100755 (executable)
--- a/samples/qt/Tutorial/custom.sh
+++ b/samples/qt/Tutorial/custom.sh
@@ -1,10 +1,4 @@
-#!/bin/sh
+#!/bin/bash
+#Define QT_DIR variables in order to generate Makefile files by qmake
 
-#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake.
-#If you are using Mac OS X it is necessary to define WOKHOME as a path to your WOK installation directory.
-
-export CASROOT=""
-
-export QTDIR=""
-
-export WOKHOME=""
+export QT_DIR=""

diff --git a/samples/qt/Tutorial/env.bat b/samples/qt/Tutorial/env.bat
index dc58bd5d775916e5c5f9578bcaeb22e705ff3a94..8ac246656c1e543f6d114f72bcd3e9c272a19238 100755 (executable)
--- a/samples/qt/Tutorial/env.bat
+++ b/samples/qt/Tutorial/env.bat
@@ -1,6 +1,11 @@
+@echo off
+
+call "custom.bat" %1 %2 %3
+
 call "%~dp0..\..\..\env.bat" %1 %2 %3
 
-SET "SAMPLESROOT=%~dp0.."
-SET "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
-SET "CSF_ResourcesDefaults=%RES_DIR%"
-SET "CSF_TutorialResourcesDefaults=%RES_DIR%"
+set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
+set "CSF_ResourcesDefaults=%RES_DIR%"
+set "CSF_TutorialResourcesDefaults=%RES_DIR%"
+
+set "PATH=%QT_DIR%/bin;%PATH%"

diff --git a/samples/qt/Tutorial/env.sh b/samples/qt/Tutorial/env.sh
index dcc2990425f4108126495ffa50ae572d498fa963..e26767091f671304553509a62cc17f94b26485c4 100755 (executable)
--- a/samples/qt/Tutorial/env.sh
+++ b/samples/qt/Tutorial/env.sh
@@ -1,19 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
-if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/custom.sh"; fi
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-if test "${CASROOT}" == ""; then
-   echo "Environment variable \"CASROOT\" not defined. Define it in \"custom.sh\" script."
-   exit 1
+if [ -e "custom.sh" ]; then
+   source "custom.sh";
 fi
 
-if test "${QTDIR}" == ""; then
-   echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script."
-   exit 1
+if [ -e "${aSamplePath}/../../../env.sh" ]; then
+   source "${aSamplePath}/../../../env.sh";
 fi
 
-if test `uname -s` == "Darwin" && test "${WOKHOME}" == ""; then
-   echo "Environment variable \"WOKHOME\" not defined. Define it in \"custom.sh\" script."
+if test "${QT_DIR}" == ""; then
+   echo "Environment variable \"QT_DIR\" not defined. Define it in \"custom.sh\" script."
    exit 1
 fi
 
@@ -21,7 +19,4 @@ host=`uname -s`
 export STATION=$host
 export RES_DIR=${aSamplePath}/${STATION}/res
 
-export PATH=${QTDIR}/bin:${PATH}
-
-source $CASROOT/env.sh
-export CSF_OPT_INC="${CASROOT}/inc:${WOKHOME}/lib:${CSF_OPT_INC}"
+export PATH=${QT_DIR}/bin:${PATH}

diff --git a/samples/qt/Tutorial/genproj.bat b/samples/qt/Tutorial/genproj.bat
index 7830bfd6d0f4e9f40a509254ce366c88e107c8bf..2cac91964b4a8d43fe69071c6760bf89711f7b7d 100644 (file)
--- a/samples/qt/Tutorial/genproj.bat
+++ b/samples/qt/Tutorial/genproj.bat
@@ -1,5 +1,6 @@
+@echo off
 REM Generation of vcproj files with qmake utilite
-REM Variable QTDIR and PATH to qmake executable must be defined without fail
+REM Variable QT_DIR and PATH to qmake executable must be defined without fail
 
 REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)

diff --git a/samples/qt/Tutorial/make.sh b/samples/qt/Tutorial/make.sh
index 895403a749cfd425cba39e070794b5b4882359f8..791c414b9af7b64eedd97147201441073224c023 100644 (file)
--- a/samples/qt/Tutorial/make.sh
+++ b/samples/qt/Tutorial/make.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi

diff --git a/samples/qt/Tutorial/run.sh b/samples/qt/Tutorial/run.sh
index c2eb83498fd212daacf7cf65aa8c134b1fa63b12..c06f3fed5e77f2d4041aa8a8af27a9cb2f43e4e9 100755 (executable)
--- a/samples/qt/Tutorial/run.sh
+++ b/samples/qt/Tutorial/run.sh
@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
 cd $aSamplePath