OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0028064: Samples - Raytracing does not work in Qt samples

Browse Source 
QAction signal activated() was changed to signal triggered() to support Qt5.
This commit is contained in:
ski 2016-11-08 14:57:46 +03:00 committed by apn
parent 0e5ef9264f
commit a1565817f1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/qt/Common/src/ApplicationCommon.cxx
View File

@ -86,7 +86,7 @@ void ApplicationCommonWindow::createStandardOperations()
filePrefUseVBOAction->setStatusTip( QObject::tr("TBR_USE_VBO") );
filePrefUseVBOAction->setCheckable( true );
filePrefUseVBOAction->setChecked( true );
connect( filePrefUseVBOAction, SIGNAL( activated() ) , this, SLOT( onUseVBO() ) );
connect( filePrefUseVBOAction, SIGNAL( triggered() ) , this, SLOT( onUseVBO() ) );
myStdActions.insert( FilePrefUseVBOId, filePrefUseVBOAction );
fileQuitAction = new QAction( QObject::tr("MNU_QUIT"), this );

12
samples/qt/Common/src/View.cxx
View File

@ -517,7 +517,7 @@ void View::initRaytraceActions()
a->setStatusTip( QObject::tr("TBR_TOOL_RAYTRACING") );
a->setCheckable( true );
a->setChecked( false );
connect( a, SIGNAL( activated() ) , this, SLOT( onRaytraceAction() ) );
connect( a, SIGNAL( triggered() ) , this, SLOT( onRaytraceAction() ) );
myRaytraceActions->insert( ToolRaytracingId, a );
a = new QAction( QPixmap( dir+QObject::tr("ICON_TOOL_SHADOWS") ), QObject::tr("MNU_TOOL_SHADOWS"), this );
@ -525,7 +525,7 @@ void View::initRaytraceActions()
a->setStatusTip( QObject::tr("TBR_TOOL_SHADOWS") );
a->setCheckable( true );
a->setChecked( true );
connect( a, SIGNAL( activated() ) , this, SLOT( onRaytraceAction() ) );
connect( a, SIGNAL( triggered() ) , this, SLOT( onRaytraceAction() ) );
myRaytraceActions->insert( ToolShadowsId, a );
a = new QAction( QPixmap( dir+QObject::tr("ICON_TOOL_REFLECTIONS") ), QObject::tr("MNU_TOOL_REFLECTIONS"), this );
@ -533,7 +533,7 @@ void View::initRaytraceActions()
a->setStatusTip( QObject::tr("TBR_TOOL_REFLECTIONS") );
a->setCheckable( true );
a->setChecked( false );
connect( a, SIGNAL( activated() ) , this, SLOT( onRaytraceAction() ) );
connect( a, SIGNAL( triggered() ) , this, SLOT( onRaytraceAction() ) );
myRaytraceActions->insert( ToolReflectionsId, a );
a = new QAction( QPixmap( dir+QObject::tr("ICON_TOOL_ANTIALIASING") ), QObject::tr("MNU_TOOL_ANTIALIASING"), this );
@ -541,7 +541,7 @@ void View::initRaytraceActions()
a->setStatusTip( QObject::tr("TBR_TOOL_ANTIALIASING") );
a->setCheckable( true );
a->setChecked( false );
connect( a, SIGNAL( activated() ) , this, SLOT( onRaytraceAction() ) );
connect( a, SIGNAL( triggered() ) , this, SLOT( onRaytraceAction() ) );
myRaytraceActions->insert( ToolAntialiasingId, a );
}
@ -900,13 +900,13 @@ void View::Popup( const int /*x*/, const int /*y*/ )
QAction* a = new QAction( QObject::tr("MNU_CH_BACK"), this );
a->setToolTip( QObject::tr("TBR_CH_BACK") );
connect( a, SIGNAL( activated() ), this, SLOT( onBackground() ) );
connect( a, SIGNAL( triggered() ), this, SLOT( onBackground() ) );
myBackMenu->addAction( a );
addItemInPopup(myBackMenu);
a = new QAction( QObject::tr("MNU_CH_ENV_MAP"), this );
a->setToolTip( QObject::tr("TBR_CH_ENV_MAP") );
connect( a, SIGNAL( activated() ), this, SLOT( onEnvironmentMap() ) );
connect( a, SIGNAL( triggered() ), this, SLOT( onEnvironmentMap() ) );
a->setCheckable( true );
a->setChecked( false );
myBackMenu->addAction( a );