OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

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

Browse Source 
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.
This commit is contained in:
dbp
2014-01-22 19:07:53 +04:00
committed by bugmaster
parent c5d477170e
commit 861a7b03e1
23 changed files with 435 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
samples/qt/Tutorial/Tutorial.pro
View File

@@ -3,7 +3,7 @@ CONFIG += debug_and_release qt
TARGET = Tutorial
SAMPLESROOT = $$(CASROOT)/samples/qt
SAMPLESROOT = $$(SAMPLESROOT)
HEADERS = src/*.h \
$${SAMPLESROOT}/Common/src/*.h \
@@ -26,7 +26,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)
@@ -40,11 +42,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)
@@ -65,107 +67,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
@@ -201,4 +119,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
}