Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
GLViewer
/
GLViewer_Viewer.cxx
diff --git
a/src/GLViewer/GLViewer_Viewer.cxx
b/src/GLViewer/GLViewer_Viewer.cxx
index 3d59798ee1e62ed1e52cd7b7c933c02850b4ad2e..663ab4dcee425892d7ad96cb69a1b83ecfce7ded 100644
(file)
--- a/
src/GLViewer/GLViewer_Viewer.cxx
+++ b/
src/GLViewer/GLViewer_Viewer.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-888,7
+888,9
@@
void GLViewer_ViewSketcher::onSketch( SketchState state )
if ( state == Fin )
{
if ( state == Fin )
{
- QApplication::syncX(); /* force rectangle redrawing */
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ QApplication::syncX(); /* force rectangle redrawing */
+#endif
myViewer->activateSketching( GLViewer_Viewer::NoSketching );
}
}
myViewer->activateSketching( GLViewer_Viewer::NoSketching );
}
}