0024479: Ray Tracing mode does not work in Qt IE sample

Implementation of Ray Tracing mode in standard Qt sample Fix compile warnings in Qt samples. Fix tabs in Common-string.ts. Update Code style. 0024415: Update QT samples Code which was based on QT3 was removed. Some bugs and warnings has been also fixed. Porting from QT4 to QT5 sample files.
2025-08-09 13:22:24 +03:00 · 2014-01-22 19:07:53 +04:00
parent c5d477170e
commit 861a7b03e1
23 changed files with 435 additions and 634 deletions
--- a/samples/qt/IESample/IESample-vc10.sln
+++ b/samples/qt/IESample/IESample-vc10.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcxproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcxproj", "{7972FDD8-9612-3401-827F-C8DF8E2689B5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -8,12 +8,12 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Debug|Win32.Build.0 = Debug|Win32
-		{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Release|Win32.ActiveCfg = Release|Win32
-		{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Release|Win32.Build.0 = Release|Win32
+		{7972FDD8-9612-3401-827F-C8DF8E2689B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7972FDD8-9612-3401-827F-C8DF8E2689B5}.Debug|Win32.Build.0 = Debug|Win32
+		{7972FDD8-9612-3401-827F-C8DF8E2689B5}.Release|Win32.ActiveCfg = Release|Win32
+		{7972FDD8-9612-3401-827F-C8DF8E2689B5}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-EndGlobal
+EndGlobal
--- a/samples/qt/IESample/IESample-vc9.sln
+++ b/samples/qt/IESample/IESample-vc9.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{AD4DADCB-F15E-37FD-B3AA-88504FAAF4FD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -8,10 +8,10 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Debug|Win32.Build.0 = Debug|Win32
-		{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Release|Win32.ActiveCfg = Release|Win32
-		{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Release|Win32.Build.0 = Release|Win32
+		{AD4DADCB-F15E-37FD-B3AA-88504FAAF4FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AD4DADCB-F15E-37FD-B3AA-88504FAAF4FD}.Debug|Win32.Build.0 = Debug|Win32
+		{AD4DADCB-F15E-37FD-B3AA-88504FAAF4FD}.Release|Win32.ActiveCfg = Release|Win32
+		{AD4DADCB-F15E-37FD-B3AA-88504FAAF4FD}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -3,10 +3,9 @@ CONFIG += debug_and_release qt

 TARGET = IESample

-SAMPLESROOT = $$(CASROOT)/samples/qt
+SAMPLESROOT = $$(SAMPLESROOT)

-HEADERS   = src/*.h \
-            $${SAMPLESROOT}/Common/src/*.h \
+HEADERS   = $${SAMPLESROOT}/Common/src/*.h \
            $${SAMPLESROOT}/Interface/src/*.h

 SOURCES   = src/*.cxx \
@@ -24,7 +23,9 @@ RES_DIR   = $$quote($$(RES_DIR))
 INCLUDEPATH += $$quote($${SAMPLESROOT}/Common/src)
 INCLUDEPATH += $$quote($${SAMPLESROOT}/Interface/src)

-DEFINES = CSFDB
+OCCT_DEFINES = $$(CSF_DEFINES)
+
+DEFINES = CSFDB $$split(OCCT_DEFINES, ;)

 unix {
    UNAME = $$system(uname -s)
@@ -38,11 +39,11 @@ unix {
    CONFIG(debug, debug|release) {
 	DESTDIR = ./$$UNAME/bind
 	OBJECTS_DIR = ./$$UNAME/objd
-	MOC_DIR = ./$$UNAME/srcd
+	MOC_DIR = ./$$UNAME/mocd
    } else {
 	DESTDIR = ./$$UNAME/bin
 	OBJECTS_DIR = ./$$UNAME/obj
-	MOC_DIR = ./$$UNAME/src
+	MOC_DIR = ./$$UNAME/moc
    }

    MACOSX_USE_GLX = $$(MACOSX_USE_GLX)
@@ -63,107 +64,23 @@ win32 {

    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)
-		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
-		DESTDIR = ./win32/vc7/bind
-		OBJECTS_DIR = ./win32/vc7/objd
-		MOC_DIR = ./win32/vc7/srcd
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
-		DESTDIR = ./win32/vc8/bind
-		OBJECTS_DIR = ./win32/vc8/objd
-		MOC_DIR = ./win32/vc8/srcd
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
-		DESTDIR = ./win32/vc9/bind
-		OBJECTS_DIR = ./win32/vc9/objd
-		MOC_DIR = ./win32/vc9/srcd
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
-		DESTDIR = ./win32/vc10/bind
-		OBJECTS_DIR = ./win32/vc10/objd
-		MOC_DIR = ./win32/vc10/srcd
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1700) {
-		DESTDIR = ./win32/vc11/bind
-		OBJECTS_DIR = ./win32/vc11/objd
-		MOC_DIR = ./win32/vc11/srcd
-	    }
+	    LIBS = -L$(CSF_OPT_LIB32D)
 	} else {
-		LIBS = -L$(CSF_OPT_LIB64D)
-		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
-		DESTDIR = ./win64/vc8/bind
-		OBJECTS_DIR = ./win64/vc8/objd
-		MOC_DIR = ./win64/vc8/srcd
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
-		DESTDIR = ./win64/vc9/bind
-		OBJECTS_DIR = ./win64/vc9/objd
-		MOC_DIR = ./win64/vc9/srcd
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
-		DESTDIR = ./win64/vc10/bind
-		OBJECTS_DIR = ./win64/vc10/objd
-		MOC_DIR = ./win64/vc10/srcd
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1700) {
-		DESTDIR = ./win64/vc11/bind
-		OBJECTS_DIR = ./win64/vc11/objd
-		MOC_DIR = ./win64/vc11/srcd
-	    }
+	    LIBS = -L$(CSF_OPT_LIB64D)
 	}
    } 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)
-		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
-		DESTDIR = ./win32/vc7/bin
-		OBJECTS_DIR = ./win32/vc7/obj
-		MOC_DIR = ./win32/vc7/src
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
-		DESTDIR = ./win32/vc8/bin
-		OBJECTS_DIR = ./win32/vc8/obj
-		MOC_DIR = ./win32/vc8/src
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
-		DESTDIR = ./win32/vc9/bin
-		OBJECTS_DIR = ./win32/vc9/obj
-		MOC_DIR = ./win32/vc9/src
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
-		DESTDIR = ./win32/vc10/bin
-		OBJECTS_DIR = ./win32/vc10/obj
-		MOC_DIR = ./win32/vc10/src
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1700) {
-		DESTDIR = ./win32/vc11/bin
-		OBJECTS_DIR = ./win32/vc11/obj
-		MOC_DIR = ./win32/vc11/src
-	    }
+	    LIBS = -L$(CSF_OPT_LIB32)
 	} else {
-		LIBS = -L$(CSF_OPT_LIB64)
-		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
-		DESTDIR = ./win64/vc8/bin
-		OBJECTS_DIR = ./win64/vc8/obj
-		MOC_DIR = ./win64/vc8/src
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
-		DESTDIR = ./win64/vc9/bin
-		OBJECTS_DIR = ./win64/vc9/obj
-		MOC_DIR = ./win64/vc9/src
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
-		DESTDIR = ./win64/vc10/bin
-		OBJECTS_DIR = ./win64/vc10/obj
-		MOC_DIR = ./win64/vc10/src
-	    }
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1700) {
-		DESTDIR = ./win64/vc11/bin
-		OBJECTS_DIR = ./win64/vc11/obj
-		MOC_DIR = ./win64/vc11/src
-	    }
+	    LIBS = -L$(CSF_OPT_LIB64)
 	}
    }
    DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
@@ -199,3 +116,8 @@ copy_res.CONFIG += no_link target_predeps
 win32: copy_res.commands = type ${QMAKE_FILE_IN} > $${RES_DIR}/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
 unix:  copy_res.commands = cp -f ${QMAKE_FILE_IN} $${RES_DIR}
 QMAKE_EXTRA_COMPILERS += copy_res
+#QMAKE_CXXFLAGS += /wd4996
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT += widgets
+}
--- a/samples/qt/IESample/env.bat
+++ b/samples/qt/IESample/env.bat
@@ -1,5 +1,6 @@
 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%"
--- a/samples/qt/IESample/generation-vc-projects.bat
+++ b/samples/qt/IESample/generation-vc-projects.bat
@@ -7,6 +7,8 @@ REM third argument specifies Debug or Release mode

 call "%~dp0env.bat" %1 %2 %3

+set EXT=vcproj
+
 if not "%1" == "" (
    if /I "%1" == "vc8" (
        set VCVER=vc8
@@ -16,9 +18,11 @@ if not "%1" == "" (
        set "VCVARS=%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
    ) else if /I "%1" == "vc10" (
        set VCVER=vc10
+        set EXT=vcxproj
        set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
    ) else if /I "%1" == "vc11" (
        set VCVER=vc11
+        set EXT=vcxproj
        set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
    ) else (
        echo Error: first argument ^(%1^) should specify supported version of Visual C++,
@@ -32,4 +36,4 @@ if ["%ARCH%"] == ["64"] set VCARCH=amd64

 call "%VCVARS%" %VCARCH%

-qmake -tp vc -r IESample.pro
+qmake -tp vc -o IESample.%EXT% IESample.pro