[libqglviewer] 01/03: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Fri Jun 26 19:56:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository libqglviewer.
commit 322819831b92f080206286147ab5ae8a7785417d
Merge: 3f0191e dc9007d
Author: Anton Gladky <gladk at debian.org>
Date: Fri Jun 26 18:59:10 2015 +0200
Merge.
CHANGELOG | 4 +
QGLViewer/QGLViewer.pro | 243 ++++++++++++---------
QGLViewer/VRender/AxisAlignedBox.h | 4 +
QGLViewer/VRender/BSPSortMethod.cpp | 4 +
QGLViewer/VRender/BackFaceCullingOptimizer.cpp | 4 +
QGLViewer/VRender/EPSExporter.cpp | 4 +
QGLViewer/VRender/Exporter.cpp | 4 +
QGLViewer/VRender/Exporter.h | 4 +
QGLViewer/VRender/FIGExporter.cpp | 4 +
QGLViewer/VRender/NVector3.cpp | 4 +
QGLViewer/VRender/NVector3.h | 4 +
QGLViewer/VRender/Optimizer.h | 4 +
QGLViewer/VRender/ParserGL.cpp | 4 +
QGLViewer/VRender/ParserGL.h | 4 +
QGLViewer/VRender/Primitive.cpp | 4 +
QGLViewer/VRender/Primitive.h | 4 +
QGLViewer/VRender/PrimitivePositioning.cpp | 4 +
QGLViewer/VRender/PrimitivePositioning.h | 4 +
QGLViewer/VRender/SortMethod.h | 4 +
QGLViewer/VRender/TopologicalSortMethod.cpp | 4 +
QGLViewer/VRender/Types.h | 4 +
QGLViewer/VRender/VRender.cpp | 4 +
QGLViewer/VRender/VRender.h | 4 +
QGLViewer/VRender/Vector2.cpp | 4 +
QGLViewer/VRender/Vector2.h | 4 +
QGLViewer/VRender/Vector3.cpp | 4 +
QGLViewer/VRender/Vector3.h | 4 +
QGLViewer/VRender/VisibilityOptimizer.cpp | 4 +
QGLViewer/VRender/gpc.cpp | 4 +
QGLViewer/VRender/gpc.h | 4 +
QGLViewer/camera.cpp | 16 ++
QGLViewer/camera.h | 4 +
QGLViewer/config.h | 8 +
QGLViewer/constraint.cpp | 4 +
QGLViewer/constraint.h | 4 +
QGLViewer/domUtils.h | 4 +
QGLViewer/frame.cpp | 4 +
QGLViewer/frame.h | 4 +
QGLViewer/keyFrameInterpolator.cpp | 4 +
QGLViewer/keyFrameInterpolator.h | 4 +
QGLViewer/manipulatedCameraFrame.cpp | 4 +
QGLViewer/manipulatedCameraFrame.h | 4 +
QGLViewer/manipulatedFrame.cpp | 8 +
QGLViewer/manipulatedFrame.h | 4 +
QGLViewer/mouseGrabber.cpp | 4 +
QGLViewer/mouseGrabber.h | 4 +
QGLViewer/qglviewer.cpp | 18 ++
QGLViewer/qglviewer.h | 4 +
QGLViewer/quaternion.cpp | 11 +
QGLViewer/quaternion.h | 4 +
QGLViewer/saveSnapshot.cpp | 4 +
QGLViewer/vec.cpp | 4 +
QGLViewer/vec.h | 4 +
README | 4 +
designerPlugin/designerPlugin.pro | 4 +
designerPlugin/qglviewerPlugin.Qt3.cpp | 4 +
designerPlugin/qglviewerPlugin.Qt3.h | 4 +
designerPlugin/qglviewerPlugin.cpp | 4 +
designerPlugin/qglviewerPlugin.h | 4 +
doc/changeLog-1.html | 4 +
doc/changeLog.html | 31 +++
doc/commercial.html | 4 +
doc/compilation.html | 20 ++
doc/developer.html | 4 +
doc/download.html | 9 +-
doc/download_statistics.html | 4 +
doc/dualLicensing.html | 4 +
doc/examples/animation.html | 4 +
doc/examples/callback.html | 4 +
doc/examples/cameraLight.html | 4 +
doc/examples/clippingPlane.html | 4 +
doc/examples/constrainedCamera.html | 4 +
doc/examples/constrainedFrame.html | 4 +
doc/examples/contribs.html | 4 +
doc/examples/drawLight.html | 4 +
doc/examples/fastDraw.html | 4 +
doc/examples/frameTransform.html | 4 +
doc/examples/frustumCulling.html | 4 +
doc/examples/index.html | 4 +
doc/examples/interface.html | 4 +
doc/examples/keyFrames.html | 4 +
doc/examples/keyboardAndMouse.html | 4 +
doc/examples/luxo.html | 7 +
doc/examples/manipulatedFrame.html | 4 +
doc/examples/mouseGrabber.html | 4 +
doc/examples/multiSelect.html | 7 +
doc/examples/multiView.html | 4 +
doc/examples/overpainting.html | 4 +
doc/examples/screenCoordSystem.html | 7 +
doc/examples/select.html | 4 +
doc/examples/simpleViewer.html | 4 +
doc/examples/standardCamera.html | 4 +
doc/examples/stereoViewer.html | 4 +
doc/faq.html | 4 +
doc/features.html | 4 +
doc/index.fr.html | 94 ++++++++
doc/index.html | 28 ++-
doc/installUnix.html | 42 ++++
doc/installWindows.html | 12 +
doc/introduction.html | 4 +
doc/keyboard.html | 4 +
doc/libQGLViewer-2.6.3.qch | Bin 0 -> 705536 bytes
doc/mouse.html | 4 +
doc/refManual/annotated.html | 19 +-
doc/refManual/{ftv2mlastnode.png => arrowdown.png} | Bin
.../{ftv2plastnode.png => arrowright.png} | Bin
doc/refManual/camera_8cpp.html | 19 +-
doc/refManual/camera_8h.html | 19 +-
doc/refManual/classQGLViewer-members.html | 19 +-
doc/refManual/classQGLViewer.html | 19 +-
doc/refManual/classes.html | 19 +-
...ssqglviewer_1_1AxisPlaneConstraint-members.html | 19 +-
.../classqglviewer_1_1AxisPlaneConstraint.html | 19 +-
.../classqglviewer_1_1Camera-members.html | 19 +-
doc/refManual/classqglviewer_1_1Camera.html | 31 ++-
...classqglviewer_1_1CameraConstraint-members.html | 19 +-
.../classqglviewer_1_1CameraConstraint.html | 19 +-
.../classqglviewer_1_1Constraint-members.html | 19 +-
doc/refManual/classqglviewer_1_1Constraint.html | 19 +-
doc/refManual/classqglviewer_1_1Frame-members.html | 19 +-
doc/refManual/classqglviewer_1_1Frame.html | 19 +-
...sqglviewer_1_1KeyFrameInterpolator-members.html | 19 +-
.../classqglviewer_1_1KeyFrameInterpolator.html | 19 +-
.../classqglviewer_1_1LocalConstraint-members.html | 19 +-
.../classqglviewer_1_1LocalConstraint.html | 19 +-
...glviewer_1_1ManipulatedCameraFrame-members.html | 19 +-
.../classqglviewer_1_1ManipulatedCameraFrame.html | 22 +-
...classqglviewer_1_1ManipulatedFrame-members.html | 19 +-
.../classqglviewer_1_1ManipulatedFrame.html | 22 +-
.../classqglviewer_1_1MouseGrabber-members.html | 19 +-
doc/refManual/classqglviewer_1_1MouseGrabber.html | 22 +-
.../classqglviewer_1_1Quaternion-members.html | 19 +-
doc/refManual/classqglviewer_1_1Quaternion.html | 19 +-
doc/refManual/classqglviewer_1_1Vec-members.html | 19 +-
doc/refManual/classqglviewer_1_1Vec.html | 19 +-
.../classqglviewer_1_1WorldConstraint-members.html | 19 +-
.../classqglviewer_1_1WorldConstraint.html | 19 +-
doc/refManual/config_8h.html | 27 ++-
doc/refManual/constraint_8cpp.html | 19 +-
doc/refManual/constraint_8h.html | 19 +-
.../dir_0d5ec90603fafeb6b6840b6051802ddc.html | 19 +-
doc/refManual/{ftv2doc.png => doc.png} | Bin
doc/refManual/domUtils_8h.html | 19 +-
doc/refManual/files.html | 19 +-
.../{ftv2folderclosed.png => folderclosed.png} | Bin
.../{ftv2folderopen.png => folderopen.png} | Bin
doc/refManual/frame_8cpp.html | 19 +-
doc/refManual/frame_8h.html | 19 +-
doc/refManual/ftv2blank.png | Bin 86 -> 0 bytes
doc/refManual/ftv2lastnode.png | Bin 86 -> 0 bytes
doc/refManual/ftv2link.png | Bin 746 -> 0 bytes
doc/refManual/ftv2mnode.png | Bin 246 -> 0 bytes
doc/refManual/ftv2node.png | Bin 86 -> 0 bytes
doc/refManual/ftv2pnode.png | Bin 229 -> 0 bytes
doc/refManual/ftv2vertline.png | Bin 86 -> 0 bytes
doc/refManual/functions.html | 19 +-
doc/refManual/functions_b.html | 19 +-
doc/refManual/functions_c.html | 19 +-
doc/refManual/functions_d.html | 19 +-
doc/refManual/functions_e.html | 19 +-
doc/refManual/functions_enum.html | 19 +-
doc/refManual/functions_eval.html | 19 +-
doc/refManual/functions_f.html | 19 +-
doc/refManual/functions_func.html | 19 +-
doc/refManual/functions_func_b.html | 19 +-
doc/refManual/functions_func_c.html | 19 +-
doc/refManual/functions_func_d.html | 19 +-
doc/refManual/functions_func_e.html | 19 +-
doc/refManual/functions_func_f.html | 19 +-
doc/refManual/functions_func_g.html | 19 +-
doc/refManual/functions_func_h.html | 19 +-
doc/refManual/functions_func_i.html | 19 +-
doc/refManual/functions_func_k.html | 19 +-
doc/refManual/functions_func_l.html | 19 +-
doc/refManual/functions_func_m.html | 19 +-
doc/refManual/functions_func_n.html | 19 +-
doc/refManual/functions_func_o.html | 19 +-
doc/refManual/functions_func_p.html | 19 +-
doc/refManual/functions_func_q.html | 19 +-
doc/refManual/functions_func_r.html | 19 +-
doc/refManual/functions_func_s.html | 19 +-
doc/refManual/functions_func_t.html | 19 +-
doc/refManual/functions_func_u.html | 19 +-
doc/refManual/functions_func_v.html | 19 +-
doc/refManual/functions_func_w.html | 19 +-
doc/refManual/functions_func_z.html | 19 +-
doc/refManual/functions_func_~.html | 19 +-
doc/refManual/functions_g.html | 19 +-
doc/refManual/functions_h.html | 19 +-
doc/refManual/functions_i.html | 19 +-
doc/refManual/functions_k.html | 19 +-
doc/refManual/functions_l.html | 19 +-
doc/refManual/functions_m.html | 19 +-
doc/refManual/functions_n.html | 19 +-
doc/refManual/functions_o.html | 19 +-
doc/refManual/functions_p.html | 19 +-
doc/refManual/functions_q.html | 19 +-
doc/refManual/functions_r.html | 19 +-
doc/refManual/functions_rela.html | 19 +-
doc/refManual/functions_s.html | 19 +-
doc/refManual/functions_t.html | 19 +-
doc/refManual/functions_u.html | 19 +-
doc/refManual/functions_v.html | 19 +-
doc/refManual/functions_vars.html | 19 +-
doc/refManual/functions_w.html | 19 +-
doc/refManual/functions_x.html | 19 +-
doc/refManual/functions_y.html | 19 +-
doc/refManual/functions_z.html | 19 +-
doc/refManual/functions_~.html | 19 +-
doc/refManual/globals.html | 19 +-
doc/refManual/globals_defs.html | 19 +-
doc/refManual/globals_func.html | 19 +-
doc/refManual/hierarchy.html | 19 +-
doc/refManual/index.filtered.qhp | 37 ++--
doc/refManual/index.html | 19 +-
doc/refManual/index.qhp | 37 ++--
doc/refManual/keyFrameInterpolator_8cpp.html | 19 +-
doc/refManual/keyFrameInterpolator_8h.html | 19 +-
doc/refManual/manipulatedCameraFrame_8cpp.html | 19 +-
doc/refManual/manipulatedCameraFrame_8h.html | 19 +-
doc/refManual/manipulatedFrame_8cpp.html | 19 +-
doc/refManual/manipulatedFrame_8h.html | 19 +-
doc/refManual/mouseGrabber_8cpp.html | 19 +-
doc/refManual/mouseGrabber_8h.html | 19 +-
doc/refManual/namespaceqglviewer.html | 19 +-
doc/refManual/namespaces.html | 19 +-
doc/refManual/qglviewer_8cpp.html | 19 +-
doc/refManual/qglviewer_8h.html | 19 +-
doc/refManual/quaternion_8cpp.html | 19 +-
doc/refManual/quaternion_8h.html | 19 +-
doc/refManual/saveSnapshot_8cpp.html | 19 +-
doc/refManual/search/all_0.html | 2 +-
doc/refManual/search/all_1.html | 2 +-
doc/refManual/search/all_10.html | 2 +-
doc/refManual/search/all_11.html | 2 +-
doc/refManual/search/all_12.html | 2 +-
doc/refManual/search/all_13.html | 2 +-
doc/refManual/search/all_14.html | 2 +-
doc/refManual/search/all_15.html | 2 +-
doc/refManual/search/all_16.html | 2 +-
doc/refManual/search/all_17.html | 2 +-
doc/refManual/search/all_18.html | 2 +-
doc/refManual/search/all_19.html | 2 +-
doc/refManual/search/all_2.html | 2 +-
doc/refManual/search/all_3.html | 2 +-
doc/refManual/search/all_4.html | 2 +-
doc/refManual/search/all_5.html | 2 +-
doc/refManual/search/all_6.html | 2 +-
doc/refManual/search/all_7.html | 2 +-
doc/refManual/search/all_8.html | 2 +-
doc/refManual/search/all_9.html | 2 +-
doc/refManual/search/all_a.html | 2 +-
doc/refManual/search/all_b.html | 2 +-
doc/refManual/search/all_c.html | 2 +-
doc/refManual/search/all_d.html | 2 +-
doc/refManual/search/all_e.html | 2 +-
doc/refManual/search/all_f.html | 2 +-
doc/refManual/search/classes_0.html | 2 +-
doc/refManual/search/classes_1.html | 2 +-
doc/refManual/search/classes_2.html | 2 +-
doc/refManual/search/classes_3.html | 2 +-
doc/refManual/search/classes_4.html | 2 +-
doc/refManual/search/classes_5.html | 2 +-
doc/refManual/search/classes_6.html | 2 +-
doc/refManual/search/classes_7.html | 2 +-
doc/refManual/search/classes_8.html | 2 +-
doc/refManual/search/defines_0.html | 2 +-
doc/refManual/search/enums_0.html | 2 +-
doc/refManual/search/enums_1.html | 2 +-
doc/refManual/search/enums_2.html | 2 +-
doc/refManual/search/enums_3.html | 2 +-
doc/refManual/search/enumvalues_0.html | 2 +-
doc/refManual/search/enumvalues_1.html | 2 +-
doc/refManual/search/enumvalues_2.html | 2 +-
doc/refManual/search/enumvalues_3.html | 2 +-
doc/refManual/search/enumvalues_4.html | 2 +-
doc/refManual/search/enumvalues_5.html | 2 +-
doc/refManual/search/enumvalues_6.html | 2 +-
doc/refManual/search/enumvalues_7.html | 2 +-
doc/refManual/search/enumvalues_8.html | 2 +-
doc/refManual/search/enumvalues_9.html | 2 +-
doc/refManual/search/enumvalues_a.html | 2 +-
doc/refManual/search/enumvalues_b.html | 2 +-
doc/refManual/search/enumvalues_c.html | 2 +-
doc/refManual/search/enumvalues_d.html | 2 +-
doc/refManual/search/enumvalues_e.html | 2 +-
doc/refManual/search/enumvalues_f.html | 2 +-
doc/refManual/search/files_0.html | 2 +-
doc/refManual/search/files_1.html | 2 +-
doc/refManual/search/files_2.html | 2 +-
doc/refManual/search/files_3.html | 2 +-
doc/refManual/search/files_4.html | 2 +-
doc/refManual/search/files_5.html | 2 +-
doc/refManual/search/files_6.html | 2 +-
doc/refManual/search/files_7.html | 2 +-
doc/refManual/search/functions_0.html | 2 +-
doc/refManual/search/functions_1.html | 2 +-
doc/refManual/search/functions_10.html | 2 +-
doc/refManual/search/functions_11.html | 2 +-
doc/refManual/search/functions_12.html | 2 +-
doc/refManual/search/functions_13.html | 2 +-
doc/refManual/search/functions_14.html | 2 +-
doc/refManual/search/functions_15.html | 2 +-
doc/refManual/search/functions_16.html | 2 +-
doc/refManual/search/functions_17.html | 2 +-
doc/refManual/search/functions_2.html | 2 +-
doc/refManual/search/functions_3.html | 2 +-
doc/refManual/search/functions_4.html | 2 +-
doc/refManual/search/functions_5.html | 2 +-
doc/refManual/search/functions_6.html | 2 +-
doc/refManual/search/functions_7.html | 2 +-
doc/refManual/search/functions_8.html | 2 +-
doc/refManual/search/functions_9.html | 2 +-
doc/refManual/search/functions_a.html | 2 +-
doc/refManual/search/functions_b.html | 2 +-
doc/refManual/search/functions_c.html | 2 +-
doc/refManual/search/functions_d.html | 2 +-
doc/refManual/search/functions_e.html | 2 +-
doc/refManual/search/functions_f.html | 2 +-
doc/refManual/search/namespaces_0.html | 2 +-
doc/refManual/search/related_0.html | 2 +-
doc/refManual/search/related_1.html | 2 +-
doc/refManual/search/search.js | 100 ++++-----
doc/refManual/search/searchdata.js | 42 ++++
doc/refManual/search/variables_0.html | 2 +-
doc/refManual/search/variables_1.html | 2 +-
doc/refManual/search/variables_2.html | 2 +-
doc/refManual/{ftv2splitbar.png => splitbar.png} | Bin
doc/refManual/vec_8cpp.html | 19 +-
doc/refManual/vec_8h.html | 19 +-
doc/techFaq.html | 4 +
examples/animation/animation.cpp | 4 +
examples/animation/animation.h | 4 +
examples/animation/animation.pro | 4 +
examples/animation/main.cpp | 4 +
examples/callback/callback.cpp | 4 +
examples/callback/callback.h | 4 +
examples/callback/callback.pro | 4 +
examples/callback/main.cpp | 4 +
examples/cameraLight/cameraLight.cpp | 4 +
examples/cameraLight/cameraLight.h | 4 +
examples/cameraLight/cameraLight.pro | 4 +
examples/cameraLight/main.cpp | 4 +
examples/clippingPlane/clippingPlane.cpp | 4 +
examples/clippingPlane/clippingPlane.h | 4 +
examples/clippingPlane/clippingPlane.pro | 4 +
examples/clippingPlane/main.cpp | 4 +
examples/constrainedCamera/constrainedCamera.cpp | 4 +
examples/constrainedCamera/constrainedCamera.h | 4 +
examples/constrainedCamera/constrainedCamera.pro | 4 +
examples/constrainedCamera/main.cpp | 4 +
examples/constrainedFrame/constrainedFrame.cpp | 4 +
examples/constrainedFrame/constrainedFrame.h | 4 +
examples/constrainedFrame/constrainedFrame.pro | 4 +
examples/constrainedFrame/main.cpp | 4 +
examples/contribs/3dsViewer/3dsViewer.cpp | 4 +
examples/contribs/3dsViewer/3dsViewer.h | 4 +
examples/contribs/3dsViewer/3dsViewer.pro | 4 +
examples/contribs/3dsViewer/main.cpp | 4 +
examples/contribs/agora/AI/AI.pro | 4 +
examples/contribs/agora/AI/ai.cpp | 4 +
examples/contribs/agora/Viewer/Viewer.pro | 4 +
examples/contribs/agora/Viewer/agoraViewer.cpp | 4 +
examples/contribs/agora/Viewer/agoraViewer.h | 4 +
examples/contribs/agora/Viewer/board.cpp | 4 +
examples/contribs/agora/Viewer/board.h | 4 +
examples/contribs/agora/Viewer/case.cpp | 4 +
examples/contribs/agora/Viewer/case.h | 4 +
examples/contribs/agora/Viewer/computerPlayer.cpp | 4 +
examples/contribs/agora/Viewer/computerPlayer.h | 4 +
examples/contribs/agora/Viewer/main.cpp | 4 +
examples/contribs/agora/Viewer/move.cpp | 4 +
examples/contribs/agora/Viewer/move.h | 4 +
examples/contribs/agora/Viewer/undo.cpp | 4 +
examples/contribs/agora/Viewer/undo.h | 4 +
examples/contribs/anaglyph/anaglyph.cpp | 4 +
examples/contribs/anaglyph/anaglyph.h | 4 +
examples/contribs/anaglyph/anaglyph.pro | 4 +
examples/contribs/anaglyph/main.cpp | 4 +
.../contribs/backgroundImage/backgroundImage.cpp | 4 +
.../contribs/backgroundImage/backgroundImage.h | 4 +
.../contribs/backgroundImage/backgroundImage.pro | 4 +
examples/contribs/backgroundImage/main.cpp | 4 +
examples/contribs/blobWar/AI/AI.pro | 4 +
examples/contribs/blobWar/AI/ai.cpp | 4 +
examples/contribs/blobWar/Viewer/Viewer.pro | 10 +
examples/contribs/blobWar/Viewer/blobWarViewer.cpp | 4 +
examples/contribs/blobWar/Viewer/blobWarViewer.h | 4 +
examples/contribs/blobWar/Viewer/board.cpp | 4 +
examples/contribs/blobWar/Viewer/board.h | 4 +
examples/contribs/blobWar/Viewer/boardDraw.cpp | 4 +
.../contribs/blobWar/Viewer/computerPlayer.cpp | 4 +
examples/contribs/blobWar/Viewer/computerPlayer.h | 4 +
examples/contribs/blobWar/Viewer/main.cpp | 4 +
examples/contribs/blobWar/Viewer/move.cpp | 4 +
examples/contribs/blobWar/Viewer/move.h | 4 +
examples/contribs/blobWar/Viewer/undo.cpp | 4 +
examples/contribs/blobWar/Viewer/undo.h | 4 +
examples/contribs/cornerAxis/cornerAxis.cpp | 4 +
examples/contribs/cornerAxis/cornerAxis.h | 4 +
examples/contribs/cornerAxis/cornerAxis.pro | 4 +
examples/contribs/cornerAxis/main.cpp | 4 +
examples/contribs/dvonn/board.cpp | 4 +
examples/contribs/dvonn/board.h | 4 +
examples/contribs/dvonn/drawer.cpp | 4 +
examples/contribs/dvonn/drawer.h | 4 +
examples/contribs/dvonn/dvonn.pro | 10 +
examples/contribs/dvonn/dvonnviewer.cpp | 4 +
examples/contribs/dvonn/dvonnviewer.h | 4 +
examples/contribs/dvonn/dvonnwindowimpl.cpp | 4 +
examples/contribs/dvonn/dvonnwindowimpl.h | 4 +
examples/contribs/dvonn/game.cpp | 4 +
examples/contribs/dvonn/game.h | 4 +
examples/contribs/dvonn/main.cpp | 4 +
examples/contribs/eventRecorder/eventRecorder.cpp | 4 +
examples/contribs/eventRecorder/eventRecorder.h | 4 +
examples/contribs/eventRecorder/eventRecorder.pro | 4 +
examples/contribs/eventRecorder/main.cpp | 4 +
examples/contribs/eventRecorder/viewer.cpp | 4 +
examples/contribs/eventRecorder/viewer.h | 4 +
examples/contribs/quarto/glview.cpp | 4 +
examples/contribs/quarto/glview.h | 4 +
examples/contribs/quarto/jeu.cpp | 4 +
examples/contribs/quarto/jeu.h | 4 +
examples/contribs/quarto/main.cpp | 4 +
examples/contribs/quarto/piece.cpp | 4 +
examples/contribs/quarto/piece.h | 4 +
examples/contribs/quarto/quarto.cpp | 4 +
examples/contribs/quarto/quarto.h | 4 +
examples/contribs/quarto/quarto.pro | 4 +
examples/contribs/terrain/main.cpp | 4 +
examples/contribs/terrain/quadtree.cpp | 4 +
examples/contribs/terrain/quadtree.h | 4 +
examples/contribs/terrain/sky.cpp | 4 +
examples/contribs/terrain/sky.h | 4 +
examples/contribs/terrain/terrain.cpp | 4 +
examples/contribs/terrain/terrain.h | 4 +
examples/contribs/terrain/terrain.pro | 4 +
examples/contribs/terrain/tree.cpp | 4 +
examples/contribs/terrain/tree.h | 4 +
examples/contribs/terrain/viewer.cpp | 4 +
examples/contribs/terrain/viewer.h | 4 +
examples/contribs/terrain/water.cpp | 4 +
examples/contribs/terrain/water.h | 4 +
examples/contribs/textureViewer/main.cpp | 4 +
examples/contribs/textureViewer/textureViewer.cpp | 4 +
examples/contribs/textureViewer/textureViewer.h | 4 +
examples/contribs/textureViewer/textureViewer.pro | 4 +
examples/contribs/thumbnail/main.cpp | 4 +
examples/contribs/thumbnail/thumbnail.cpp | 4 +
examples/contribs/thumbnail/thumbnail.h | 4 +
examples/contribs/thumbnail/thumbnail.pro | 4 +
examples/drawLight/drawLight.cpp | 4 +
examples/drawLight/drawLight.h | 4 +
examples/drawLight/drawLight.pro | 4 +
examples/drawLight/main.cpp | 4 +
examples/examples.pri | 98 +++++++++
examples/fastDraw/fastDraw.cpp | 4 +
examples/fastDraw/fastDraw.h | 4 +
examples/fastDraw/fastDraw.pro | 4 +
examples/fastDraw/main.cpp | 4 +
examples/frameTransform/frameTransform.cpp | 4 +
examples/frameTransform/frameTransform.h | 4 +
examples/frameTransform/frameTransform.pro | 4 +
examples/frameTransform/main.cpp | 4 +
examples/frustumCulling/box.cpp | 4 +
examples/frustumCulling/box.h | 4 +
examples/frustumCulling/cullingCamera.cpp | 4 +
examples/frustumCulling/cullingCamera.h | 4 +
examples/frustumCulling/frustumCulling.cpp | 4 +
examples/frustumCulling/frustumCulling.h | 4 +
examples/frustumCulling/frustumCulling.pro | 4 +
examples/frustumCulling/main.cpp | 4 +
examples/interface/interface.cpp | 4 +
examples/interface/interface.h | 4 +
examples/interface/interface.pro | 4 +
examples/interface/main.cpp | 4 +
examples/keyFrames/keyFrames.cpp | 4 +
examples/keyFrames/keyFrames.h | 4 +
examples/keyFrames/keyFrames.pro | 4 +
examples/keyFrames/main.cpp | 4 +
examples/keyboardAndMouse/keyboardAndMouse.cpp | 4 +
examples/keyboardAndMouse/keyboardAndMouse.h | 4 +
examples/keyboardAndMouse/keyboardAndMouse.pro | 4 +
examples/keyboardAndMouse/main.cpp | 4 +
examples/luxo/luxo.cpp | 4 +
examples/luxo/luxo.h | 4 +
examples/luxo/luxo.pro | 9 +
examples/luxo/main.cpp | 4 +
examples/manipulatedFrame/main.cpp | 4 +
examples/manipulatedFrame/manipulatedFrame.cpp | 4 +
examples/manipulatedFrame/manipulatedFrame.h | 4 +
examples/manipulatedFrame/manipulatedFrame.pro | 4 +
examples/mouseGrabber/main.cpp | 4 +
examples/mouseGrabber/mouseGrabber.cpp | 4 +
examples/mouseGrabber/mouseGrabber.h | 4 +
examples/mouseGrabber/mouseGrabber.pro | 4 +
examples/multiSelect/main.cpp | 4 +
.../multiSelect/manipulatedFrameSetConstraint.cpp | 4 +
.../multiSelect/manipulatedFrameSetConstraint.h | 4 +
examples/multiSelect/multiSelect.cpp | 4 +
examples/multiSelect/multiSelect.h | 4 +
examples/multiSelect/multiSelect.pro | 9 +
examples/multiSelect/object.cpp | 4 +
examples/multiSelect/object.h | 4 +
examples/multiView/main.cpp | 4 +
examples/multiView/multiView.cpp | 4 +
examples/multiView/multiView.h | 4 +
examples/multiView/multiView.pro | 4 +
examples/overpainting/main.cpp | 4 +
examples/overpainting/overpainting.pro | 4 +
examples/overpainting/viewer.cpp | 4 +
examples/overpainting/viewer.h | 4 +
examples/screenCoordSystem/main.cpp | 4 +
examples/screenCoordSystem/screenCoordSystem.cpp | 4 +
examples/screenCoordSystem/screenCoordSystem.h | 4 +
examples/screenCoordSystem/screenCoordSystem.pro | 9 +
examples/select/main.cpp | 4 +
examples/select/select.cpp | 4 +
examples/select/select.h | 4 +
examples/select/select.pro | 4 +
examples/simpleViewer/main.cpp | 4 +
examples/simpleViewer/simpleViewer.cpp | 4 +
examples/simpleViewer/simpleViewer.h | 4 +
examples/simpleViewer/simpleViewer.pro | 4 +
examples/standardCamera/cameraViewer.cpp | 4 +
examples/standardCamera/cameraViewer.h | 4 +
examples/standardCamera/main.cpp | 4 +
examples/standardCamera/standardCamera.cpp | 4 +
examples/standardCamera/standardCamera.h | 4 +
examples/standardCamera/standardCamera.pro | 4 +
examples/standardCamera/viewer.cpp | 4 +
examples/standardCamera/viewer.h | 4 +
examples/stereoViewer/main.cpp | 4 +
examples/stereoViewer/stereoViewer.cpp | 4 +
examples/stereoViewer/stereoViewer.h | 4 +
examples/stereoViewer/stereoViewer.pro | 4 +
libQGLViewer-2.6.3.pro | 9 +
538 files changed, 3609 insertions(+), 891 deletions(-)
diff --cc CHANGELOG
index 062ade7,d18d487..b172faa
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
+This is libQGLViewer version 2.6.1. Packaged on January 22, 2015.
++=======
+ This is libQGLViewer version 2.6.3. Packaged on June 24, 2015.
++>>>>>>> upstream/2.6.3+dfsg1
The complete change log is available in doc/changeLog.html
diff --cc QGLViewer/QGLViewer.pro
index d805aa0,699a620..1aaf044
--- a/QGLViewer/QGLViewer.pro
+++ b/QGLViewer/QGLViewer.pro
@@@ -6,7 -6,7 +6,11 @@@
TEMPLATE = lib
TARGET = QGLViewer
++<<<<<<< HEAD
+VERSION = 2.6.1
++=======
+ VERSION = 2.6.3
++>>>>>>> upstream/2.6.3+dfsg1
CONFIG *= qt opengl warn_on shared thread create_prl rtti no_keywords
QGL_HEADERS = qglviewer.h \
@@@ -107,120 -106,93 +110,108 @@@ contains( DEFINES, NO_VECTORIAL_RENDER
# -- U n i x --
# ---------------
unix {
- CONFIG -= debug debug_and_release
- CONFIG *= release
-
- # INCLUDE_DIR and LIB_DIR specify where to install the include files and the library.
- # Use qmake INCLUDE_DIR=... LIB_DIR=... , or qmake PREFIX=... to customize your installation.
-
- HOME_DIR = $$system(cd;pwd)
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
- isEmpty( PREFIX ) {
- PREFIX_=/usr
- } else {
- PREFIX_=$${PREFIX}
- }
- isEmpty( LIB_DIR ) {
- LIB_DIR_ = $${PREFIX_}/lib
- } else {
- LIB_DIR_ = $${LIB_DIR}
- }
- isEmpty( INCLUDE_DIR ) {
- INCLUDE_DIR_ = $${PREFIX_}/include
- } else {
- INCLUDE_DIR_ = $${INCLUDE_DIR}
- }
- isEmpty( DOC_DIR ) {
- macx|darwin-g++ {
- isEmpty( PREFIX ) {
- DOC_DIR = $${HOME_DIR}/Library/Developer/Shared/Documentation/QGLViewer
- } else {
- DOC_DIR = $${PREFIX}/Shared/Documentation/QGLViewer
- }
+ # INCLUDE_DIR and LIB_DIR specify where to install the include files and the library.
+ # Use qmake INCLUDE_DIR=... LIB_DIR=... , or qmake PREFIX=... to customize your installation.
+ isEmpty( PREFIX ) {
+ PREFIX_=/usr/local
+ } else {
+ PREFIX_=$${PREFIX}
+ }
+ isEmpty( LIB_DIR ) {
+ LIB_DIR_ = $${PREFIX_}/lib
+ } else {
+ LIB_DIR_ = $${LIB_DIR}
+ }
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR_ = $${PREFIX_}/include
} else {
- DOC_DIR = $${PREFIX_}/share/doc/QGLViewer
+ INCLUDE_DIR_ = $${INCLUDE_DIR}
+ }
+ isEmpty( DOC_DIR ) {
+ macx|darwin-g++ {
+ isEmpty( PREFIX ) {
+ DOC_DIR = $${PWD}/Library/Developer/Shared/Documentation/QGLViewer
+ } else {
+ DOC_DIR = $${PREFIX}/Shared/Documentation/QGLViewer
+ }
+ } else {
+ DOC_DIR = $${PREFIX_}/share/doc/QGLViewer
+ }
}
++<<<<<<< HEAD
+ }
+
+ # GLUT for Unix architecture
+ !isEmpty( USE_GLUT ) {
+ QMAKE_LIBS_OPENGL *= -lglut
+ }
+
+ macx|darwin-g++ {
+ # GLU is part of the OpenGL framework
+ } else {
+ QMAKE_LIBS_OPENGL *= -lGLU
+ }
++=======
++>>>>>>> upstream/2.6.3+dfsg1
- MOC_DIR = .moc
- OBJECTS_DIR = .obj
+ # GLUT for Unix architecture
+ !isEmpty( USE_GLUT ) {
+ QMAKE_LIBS_OPENGL *= -lglut
+ }
- # Adds a -P option so that "make install" as root creates files owned by root and links are preserved.
- # This is not a standard option, and it may have to be removed on old Unix flavors.
- !hpux {
- QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
- }
+ macx|darwin-g++ {
+ # GLU is part of the OpenGL framework
+ } else {
+ QMAKE_LIBS_OPENGL *= -lGLU
+ }
- # Make much smaller libraries (and packages) by removing debugging informations
- QMAKE_CFLAGS_RELEASE -= -g
- QMAKE_CXXFLAGS_RELEASE -= -g
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
- # install header
- include.path = $${INCLUDE_DIR_}/QGLViewer
- # Should be $$replace(TRANSLATIONS, .ts, .qm), but 'replace' only appeared in Qt 4.3
- include.files = $${QGL_HEADERS} qglviewer_fr.qm
+ # Adds a -P option so that "make install" as root creates files owned by root and links are preserved.
+ # This is not a standard option, and it may have to be removed on old Unix flavors.
+ !hpux {
+ QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
+ }
- # install documentation html
- documentation.path = $${DOC_DIR}
- documentation.files = ../doc/*.html ../doc/*.css ../doc/*.qch
+ # Make much smaller libraries (and packages) by removing debugging informations
+ QMAKE_CFLAGS_RELEASE -= -g
+ QMAKE_CXXFLAGS_RELEASE -= -g
- # install documentation images
- docImages.path = $${DOC_DIR}/images
- docImages.files = ../doc/images/*
+ # install header
+ include.path = $${INCLUDE_DIR_}/QGLViewer
+ # Should be $$replace(TRANSLATIONS, .ts, .qm), but 'replace' only appeared in Qt 4.3
+ include.files = $${QGL_HEADERS} qglviewer_fr.qm
- # install documentation examples
- #docExamples.path = $${DOC_DIR}/examples
- #docExamples.files = ../examples/*../examples/*/*
+ # install documentation html
+ documentation.path = $${DOC_DIR}
+ documentation.files = ../doc/*.html ../doc/*.css ../doc/*.qch
- # install documentation refManual
- docRefManual.path = $${DOC_DIR}/refManual
- docRefManual.files = ../doc/refManual/*
+ # install documentation images
+ docImages.path = $${DOC_DIR}/images
+ docImages.files = ../doc/images/*
- # install static library
- #staticlib.extra = make -f Makefile.Release staticlib
- #staticlib.path = $${LIB_DIR_}
- #staticlib.files = lib$${TARGET}.a
+ # install documentation examples
+ #docExamples.path = $${DOC_DIR}/examples
+ #docExamples.files = ../examples/*../examples/*/*
- # install library
- target.path = $${LIB_DIR_}
+ # install documentation refManual
+ docRefManual.path = $${DOC_DIR}/refManual
+ docRefManual.files = ../doc/refManual/*
- # "make install" configuration options
- INSTALLS *= target include documentation docImages docRefManual
- }
+ # install static library
+ #staticlib.extra = make -f Makefile.Release staticlib
+ #staticlib.path = $${LIB_DIR_}
+ #staticlib.files = lib$${TARGET}.a
+ # install library
+ target.path = $${LIB_DIR_}
- # -----------------------
- # -- S G I I r i x --
- # -----------------------
- irix-cc|irix-n32 {
- QMAKE_CFLAGS_RELEASE -= -O3 -O2 -OPT:Olimit=30000
- QMAKE_LFLAGS_RELEASE -= -O3 -O2 -OPT:Olimit=30000
- QMAKE_CXXFLAGS_RELEASE -= -O3 -O2 -OPT:Olimit=30000
- QMAKE_CFLAGS_RELEASE *= -IPA -Ofast=IP35
- QMAKE_LFLAGS_RELEASE *= -IPA -Ofast=IP35
- QMAKE_CXXFLAGS_RELEASE *= -IPA -Ofast=IP35
- QMAKE_CFLAGS *= -LANG:std
- QMAKE_LFLAGS *= -LANG:std
- QMAKE_CXXFLAGS *= -LANG:std
- QMAKE_CFLAGS *= -woff 1424,3201,1110,1188
- QMAKE_CXXFLAGS *= -woff 1424,3201,1110,1188
- QMAKE_LIBS_OPENGL -= -lXi
- # GLUT for SGI architecture
- !isEmpty( USE_GLUT ) {
- QMAKE_LIBDIR_OPENGL *= /usr/local/lib32
- QMAKE_INCDIR_OPENGL *= /usr/local/include
- }
+ # "make install" configuration options
+ INSTALLS *= target include documentation docImages docRefManual
}
@@@ -228,50 -200,35 +219,55 @@@
# -- M a c O S X --
# -------------------
macx|darwin-g++ {
- # This setting creates a Mac framework. Comment out this line to create a dylib instead.
- !staticlib: CONFIG *= lib_bundle
+ # This setting creates a Mac framework. Comment out this line to create a dylib instead.
+ !staticlib: CONFIG *= lib_bundle
- include.files *= qglviewer.icns
+ include.files *= qglviewer.icns
- lib_bundle {
- FRAMEWORK_HEADERS.version = Versions
- # Should be $$replace(TRANSLATIONS, .ts, .qm), but 'replace' is only available in Qt 4.3
- FRAMEWORK_HEADERS.files = $${QGL_HEADERS} qglviewer.icns qglviewer_fr.qm
- FRAMEWORK_HEADERS.path = Headers
- QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
+ lib_bundle {
+ FRAMEWORK_HEADERS.version = Versions
+ # Should be $$replace(TRANSLATIONS, .ts, .qm), but 'replace' is only available in Qt 4.3
+ FRAMEWORK_HEADERS.files = $${QGL_HEADERS} qglviewer.icns qglviewer_fr.qm
+ FRAMEWORK_HEADERS.path = Headers
+ QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
- DESTDIR = $${HOME_DIR}/Library/Frameworks/
+ # So that the path QGLViewer/*.h exists
+ QMAKE_POST_LINK=cd $$DESTDIR/QGLViewer.framework/Headers && (test -L QGLViewer || ln -s . QGLViewer)
- # For a Framework, 'include' and 'lib' do no make sense.
- # These and prefix will all define the DESTDIR, in that order in case several are defined
- !isEmpty( INCLUDE_DIR ) {
- DESTDIR = $${INCLUDE_DIR}
- }
+ # Specific paths for the installation of the framework.
+ !isEmpty( LIB_DIR ) {
+ target.path = $${LIB_DIR}
+ }
- !isEmpty( LIB_DIR ) {
- DESTDIR = $${LIB_DIR}
+ # Framework already contains includes
+ INSTALLS -= include
}
- !isEmpty( PREFIX ) {
- DESTDIR = $${PREFIX}
+ # GLUT for Mac architecture
+ !isEmpty( USE_GLUT ) {
+ QMAKE_LIBS_OPENGL -= -lglut
+ QMAKE_LIBS_OPENGL *= -framework GLUT -lobjc
}
++<<<<<<< HEAD
+
+ QMAKE_POST_LINK=cd $$DESTDIR/QGLViewer.framework/Headers && (test -L QGLViewer || ln -s . QGLViewer)
+
+ #QMAKE_LFLAGS_SONAME = -Wl,-install_name, at executable_path/../Frameworks/
+ #QMAKE_LFLAGS_SONAME = -Wl,-install_name,
+
+ # Framework already installed, with includes
+ INSTALLS -= include target
+ } else {
+ #QMAKE_LFLAGS_SONAME = -Wl,-install_name,libQGLViewer.dylib
+ }
+
+ # GLUT for Macintosh architecture
+ !isEmpty( USE_GLUT ) {
+ QMAKE_LIBS_OPENGL -= -lglut
+ QMAKE_LIBS_OPENGL *= -framework GLUT -lobjc
+ }
++=======
++>>>>>>> upstream/2.6.3+dfsg1
}
@@@ -279,36 -236,36 +275,65 @@@
# -- W i n d o w s --
# ---------------------
win32 {
++<<<<<<< HEAD
+ # Windows requires a debug lib version to link against debug applications
+ CONFIG *= debug_and_release build_all
+
+ # Needed by Intel C++, (icl.exe) so that WINGDIAPI is a defined symbol in gl.h.
+ DEFINES *= WIN32
+
+ staticlib {
+ DEFINES *= QGLVIEWER_STATIC
+ } else {
+ DEFINES *= CREATE_QGLVIEWER_DLL
+ }
+
+ CONFIG *= embed_manifest_dll
+
+ # TP : C++ source code
+ # GR : Enables run-time type information (RTTI).
+ # Zi : Generates complete debugging information (removed)
+ # EHs : The exception-handling model that catches C++ exceptions only and tells the
+ # compiler to assume that functions declared as extern "C" may throw an exception.
+ # FS : Enable parallel compilation
+ # Any feedback on these flags is welcome.
+ !win32-g++ {
+ QMAKE_CXXFLAGS *= -TP -GR
+ DEFINES += NOMINMAX
+ win32-msvc {
+ QMAKE_CXXFLAGS *= -EH -FS
++=======
+ # Windows requires a debug lib version to link against debug applications
+ CONFIG *= debug_and_release build_all
+
+ # Needed by Intel C++, (icl.exe) so that WINGDIAPI is a defined symbol in gl.h.
+ DEFINES *= WIN32
+
+ staticlib {
+ DEFINES *= QGLVIEWER_STATIC
++>>>>>>> upstream/2.6.3+dfsg1
} else {
- QMAKE_CXXFLAGS *= -EHs
+ DEFINES *= CREATE_QGLVIEWER_DLL
+ }
+
+ CONFIG *= embed_manifest_dll
+
+ # TP : C++ source code
+ # GR : Enables run-time type information (RTTI).
+ # Zi : Generates complete debugging information (removed)
+ # EHs : The exception-handling model that catches C++ exceptions only and tells the
+ # compiler to assume that functions declared as extern "C" may throw an exception.
+ # FS : Enable parallel compilation
+ # Any feedback on these flags is welcome.
+ !win32-g++ {
+ QMAKE_CXXFLAGS *= -TP -GR
+ DEFINES += NOMINMAX
+ win32-msvc {
+ QMAKE_CXXFLAGS *= -EH -FS
+ } else {
+ QMAKE_CXXFLAGS *= -EHs
+ }
}
- }
}
diff --cc QGLViewer/VRender/AxisAlignedBox.h
index e27187d,db401fd..fa4b9b1
--- a/QGLViewer/VRender/AxisAlignedBox.h
+++ b/QGLViewer/VRender/AxisAlignedBox.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/BSPSortMethod.cpp
index 8c56aa0,7d43681..3081cf8
--- a/QGLViewer/VRender/BSPSortMethod.cpp
+++ b/QGLViewer/VRender/BSPSortMethod.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/BackFaceCullingOptimizer.cpp
index 86c9ba2,3cc0868..d9eb9e3
--- a/QGLViewer/VRender/BackFaceCullingOptimizer.cpp
+++ b/QGLViewer/VRender/BackFaceCullingOptimizer.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/EPSExporter.cpp
index 114b25d,9b4fa9e..93ac76d
--- a/QGLViewer/VRender/EPSExporter.cpp
+++ b/QGLViewer/VRender/EPSExporter.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Exporter.cpp
index 61632aa,fe5c00c..36515ed
--- a/QGLViewer/VRender/Exporter.cpp
+++ b/QGLViewer/VRender/Exporter.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Exporter.h
index 0543903,e01b7ee..5f45384
--- a/QGLViewer/VRender/Exporter.h
+++ b/QGLViewer/VRender/Exporter.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/FIGExporter.cpp
index 9847cf4,b741158..199002b
--- a/QGLViewer/VRender/FIGExporter.cpp
+++ b/QGLViewer/VRender/FIGExporter.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/NVector3.cpp
index 3a8df22,80864a9..bf651bb
--- a/QGLViewer/VRender/NVector3.cpp
+++ b/QGLViewer/VRender/NVector3.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/NVector3.h
index 0eb87a4,cac62e4..2cbf049
--- a/QGLViewer/VRender/NVector3.h
+++ b/QGLViewer/VRender/NVector3.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Optimizer.h
index fcf88e7,be344b4..432189a
--- a/QGLViewer/VRender/Optimizer.h
+++ b/QGLViewer/VRender/Optimizer.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/ParserGL.cpp
index 734b175,4afe15d..5ea6a48
--- a/QGLViewer/VRender/ParserGL.cpp
+++ b/QGLViewer/VRender/ParserGL.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/ParserGL.h
index 1b4609a,2374a78..bb23561
--- a/QGLViewer/VRender/ParserGL.h
+++ b/QGLViewer/VRender/ParserGL.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Primitive.cpp
index e133789,b7c2723..2dcb7f2
--- a/QGLViewer/VRender/Primitive.cpp
+++ b/QGLViewer/VRender/Primitive.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Primitive.h
index a8e90f6,34d1f75..c2872eb
--- a/QGLViewer/VRender/Primitive.h
+++ b/QGLViewer/VRender/Primitive.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/PrimitivePositioning.cpp
index d34c2ea,072d45c..1196671
--- a/QGLViewer/VRender/PrimitivePositioning.cpp
+++ b/QGLViewer/VRender/PrimitivePositioning.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/PrimitivePositioning.h
index 71d947a,1d323a3..152ff87
--- a/QGLViewer/VRender/PrimitivePositioning.h
+++ b/QGLViewer/VRender/PrimitivePositioning.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/SortMethod.h
index 89d588d,e326842..10dd9d6
--- a/QGLViewer/VRender/SortMethod.h
+++ b/QGLViewer/VRender/SortMethod.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/TopologicalSortMethod.cpp
index c9bc9d8,420e8e0..17d3d99
--- a/QGLViewer/VRender/TopologicalSortMethod.cpp
+++ b/QGLViewer/VRender/TopologicalSortMethod.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Types.h
index 6294508,e7c0944..7a7d227
--- a/QGLViewer/VRender/Types.h
+++ b/QGLViewer/VRender/Types.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/VRender.cpp
index 6d7d6cb,60562fe..ff6d86b
--- a/QGLViewer/VRender/VRender.cpp
+++ b/QGLViewer/VRender/VRender.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/VRender.h
index 93a4819,5235fe8..24bc487
--- a/QGLViewer/VRender/VRender.h
+++ b/QGLViewer/VRender/VRender.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Vector2.cpp
index 7aa8e31,2748b5b..6ea3e77
--- a/QGLViewer/VRender/Vector2.cpp
+++ b/QGLViewer/VRender/Vector2.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Vector2.h
index 234b5f0,9414768..9b173d3
--- a/QGLViewer/VRender/Vector2.h
+++ b/QGLViewer/VRender/Vector2.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Vector3.cpp
index eab723e,1292f5d..475247c
--- a/QGLViewer/VRender/Vector3.cpp
+++ b/QGLViewer/VRender/Vector3.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/Vector3.h
index df9c976,f6a5853..88bf630
--- a/QGLViewer/VRender/Vector3.h
+++ b/QGLViewer/VRender/Vector3.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/VisibilityOptimizer.cpp
index e2b9ba9,62271b7..863235c
--- a/QGLViewer/VRender/VisibilityOptimizer.cpp
+++ b/QGLViewer/VRender/VisibilityOptimizer.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/gpc.cpp
index f65bc0b,96ffa3e..1d3eac5
--- a/QGLViewer/VRender/gpc.cpp
+++ b/QGLViewer/VRender/gpc.cpp
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/VRender/gpc.h
index b7e926d,07841c6..d2e50fe
--- a/QGLViewer/VRender/gpc.h
+++ b/QGLViewer/VRender/gpc.h
@@@ -24,7 -24,7 +24,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/camera.cpp
index e4d047c,70dde8e..2abe6e2
--- a/QGLViewer/camera.cpp
+++ b/QGLViewer/camera.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
@@@ -625,7 -625,7 +629,11 @@@ void Camera::getProjectionMatrix(GLdoub
m[i] = projectionMatrix_[i];
}
++<<<<<<< HEAD
+/*! Overloaded getProjectionMatrix(GLdouble m[16]) method using a \c qreal array instead. */
++=======
+ /*! Overloaded getProjectionMatrix(GLdouble m[16]) method using a \c GLfloat array instead. */
++>>>>>>> upstream/2.6.3+dfsg1
void Camera::getProjectionMatrix(GLfloat m[16]) const
{
static GLdouble mat[16];
@@@ -658,7 -658,7 +666,11 @@@ void Camera::getModelViewMatrix(GLdoubl
}
++<<<<<<< HEAD
+/*! Overloaded getModelViewMatrix(GLdouble m[16]) method using a \c qreal array instead. */
++=======
+ /*! Overloaded getModelViewMatrix(GLdouble m[16]) method using a \c GLfloat array instead. */
++>>>>>>> upstream/2.6.3+dfsg1
void Camera::getModelViewMatrix(GLfloat m[16]) const
{
static GLdouble mat[16];
@@@ -689,7 -689,7 +701,11 @@@ void Camera::getModelViewProjectionMatr
}
}
++<<<<<<< HEAD
+/*! Overloaded getModelViewProjectionMatrix(GLdouble m[16]) method using a \c qreal array instead. */
++=======
+ /*! Overloaded getModelViewProjectionMatrix(GLdouble m[16]) method using a \c GLfloat array instead. */
++>>>>>>> upstream/2.6.3+dfsg1
void Camera::getModelViewProjectionMatrix(GLfloat m[16]) const
{
static GLdouble mat[16];
diff --cc QGLViewer/camera.h
index 579e4ca,4657f95..c7e84c7
--- a/QGLViewer/camera.h
+++ b/QGLViewer/camera.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/config.h
index a570aba,dbe1cfa..8431217
--- a/QGLViewer/config.h
+++ b/QGLViewer/config.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
@@@ -28,7 -28,7 +32,11 @@@
#ifndef QGLVIEWER_CONFIG_H
#define QGLVIEWER_CONFIG_H
++<<<<<<< HEAD
+#define QGLVIEWER_VERSION 0x020601
++=======
+ #define QGLVIEWER_VERSION 0x020603
++>>>>>>> upstream/2.6.3+dfsg1
// Needed for Qt < 4 (?)
#ifndef QT_CLEAN_NAMESPACE
diff --cc QGLViewer/constraint.cpp
index ca646ba,fbb9a6c..6583d11
--- a/QGLViewer/constraint.cpp
+++ b/QGLViewer/constraint.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/constraint.h
index e6651d1,d90d820..cedd09c
--- a/QGLViewer/constraint.h
+++ b/QGLViewer/constraint.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/domUtils.h
index 0429e46,3994468..e216062
--- a/QGLViewer/domUtils.h
+++ b/QGLViewer/domUtils.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/frame.cpp
index 71f3ad4,cce675b..284846a
--- a/QGLViewer/frame.cpp
+++ b/QGLViewer/frame.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/frame.h
index 992d44f,2b88540..b00e9b6
--- a/QGLViewer/frame.h
+++ b/QGLViewer/frame.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/keyFrameInterpolator.cpp
index 97236de,480774b..b2f7bf7
--- a/QGLViewer/keyFrameInterpolator.cpp
+++ b/QGLViewer/keyFrameInterpolator.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/keyFrameInterpolator.h
index 969de33,100cd2f..9504d94
--- a/QGLViewer/keyFrameInterpolator.h
+++ b/QGLViewer/keyFrameInterpolator.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/manipulatedCameraFrame.cpp
index 71b4681,723b0f7..8d45b0b
--- a/QGLViewer/manipulatedCameraFrame.cpp
+++ b/QGLViewer/manipulatedCameraFrame.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/manipulatedCameraFrame.h
index 1a0863b,1f500ad..b3e8b0f
--- a/QGLViewer/manipulatedCameraFrame.h
+++ b/QGLViewer/manipulatedCameraFrame.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/manipulatedFrame.cpp
index 270fded,b6b2d72..4533b7c
--- a/QGLViewer/manipulatedFrame.cpp
+++ b/QGLViewer/manipulatedFrame.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
@@@ -241,7 -241,7 +245,11 @@@ use mouse speed. Currently used to trig
void ManipulatedFrame::computeMouseSpeed(const QMouseEvent* const e)
{
const QPoint delta = (e->pos() - prevPos_);
++<<<<<<< HEAD
+ const qreal dist = sqrt(delta.x()*delta.x() + delta.y()*delta.y());
++=======
+ const qreal dist = sqrt(qreal(delta.x()*delta.x() + delta.y()*delta.y()));
++>>>>>>> upstream/2.6.3+dfsg1
delay_ = last_move_time.restart();
if (delay_ == 0)
// Less than a millisecond: assume delay = 1ms
diff --cc QGLViewer/manipulatedFrame.h
index f84b922,b27fb25..ff2543e
--- a/QGLViewer/manipulatedFrame.h
+++ b/QGLViewer/manipulatedFrame.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/mouseGrabber.cpp
index 7d4d157,38cfdd0..b679ee1
--- a/QGLViewer/mouseGrabber.cpp
+++ b/QGLViewer/mouseGrabber.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/mouseGrabber.h
index 64d5fb7,e66a8b4..e7fb9b9
--- a/QGLViewer/mouseGrabber.h
+++ b/QGLViewer/mouseGrabber.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/qglviewer.cpp
index 7e38de8,542545c..2259055
--- a/QGLViewer/qglviewer.cpp
+++ b/QGLViewer/qglviewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
@@@ -389,7 -389,7 +393,11 @@@ void QGLViewer::postDraw(
color[0] = foregroundColor().red() / 255.0f;
color[1] = foregroundColor().green() / 255.0f;
color[2] = foregroundColor().blue() / 255.0f;
++<<<<<<< HEAD
+ color[3] = 1.0;
++=======
+ color[3] = 1.0f;
++>>>>>>> upstream/2.6.3+dfsg1
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, color);
glDisable(GL_LIGHTING);
glDisable(GL_DEPTH_TEST);
@@@ -3215,9 -3215,9 +3223,15 @@@ void QGLViewer::drawArrow(qreal length
const qreal coneRadiusCoef = 4.0 - 5.0 * head;
gluCylinder(quadric, radius, radius, length * (1.0 - head/coneRadiusCoef), nbSubdivisions, 1);
++<<<<<<< HEAD
+ glTranslatef(0.0f, 0.0f, float(length * (1.0 - head)));
+ gluCylinder(quadric, coneRadiusCoef * radius, 0.0, head * length, nbSubdivisions, 1);
+ glTranslatef(0.0f, 0.0f, float(-length * (1.0 - head)));
++=======
+ glTranslated(0.0, 0.0, length * (1.0 - head));
+ gluCylinder(quadric, coneRadiusCoef * radius, 0.0, head * length, nbSubdivisions, 1);
+ glTranslated(0.0, 0.0, -length * (1.0 - head));
++>>>>>>> upstream/2.6.3+dfsg1
}
/*! Draws a 3D arrow between the 3D point \p from and the 3D point \p to, both defined in the
@@@ -3227,7 -3227,7 +3241,11 @@@ See drawArrow(qreal length, qreal radiu
void QGLViewer::drawArrow(const Vec& from, const Vec& to, qreal radius, int nbSubdivisions)
{
glPushMatrix();
++<<<<<<< HEAD
+ glTranslatef(float(from[0]), float(from[1]), float(from[2]));
++=======
+ glTranslated(from[0], from[1], from[2]);
++>>>>>>> upstream/2.6.3+dfsg1
const Vec dir = to-from;
glMultMatrixd(Quaternion(Vec(0,0,1), dir).matrix());
QGLViewer::drawArrow(dir.norm(), radius, nbSubdivisions);
diff --cc QGLViewer/qglviewer.h
index 113e0a8,14a0819..9eb6c08
--- a/QGLViewer/qglviewer.h
+++ b/QGLViewer/qglviewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/quaternion.cpp
index 1f8bd5a,0c30809..5c9c99a
--- a/QGLViewer/quaternion.cpp
+++ b/QGLViewer/quaternion.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
@@@ -152,10 -152,10 +156,17 @@@ void Quaternion::setFromRotationMatrix(
{
qWarning("setFromRotationMatrix now expects a double[3][3] parameter");
++<<<<<<< HEAD
+ float mat[3][3];
+ for (int i=0; i<3; ++i)
+ for (int j=0; j<3; ++j)
+ mat[i][j] = float(m[i][j]);
++=======
+ qreal mat[3][3];
+ for (int i=0; i<3; ++i)
+ for (int j=0; j<3; ++j)
+ mat[i][j] = qreal(m[i][j]);
++>>>>>>> upstream/2.6.3+dfsg1
setFromRotationMatrix(mat);
}
diff --cc QGLViewer/quaternion.h
index 302ecec,91f0690..40a56f9
--- a/QGLViewer/quaternion.h
+++ b/QGLViewer/quaternion.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/saveSnapshot.cpp
index 44b4b5f,4a53b8b..5d8b5b9
--- a/QGLViewer/saveSnapshot.cpp
+++ b/QGLViewer/saveSnapshot.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/vec.cpp
index 343e606,669d6f7..b84f3bf
--- a/QGLViewer/vec.cpp
+++ b/QGLViewer/vec.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc QGLViewer/vec.h
index b57e4e4,429ab62..0567729
--- a/QGLViewer/vec.h
+++ b/QGLViewer/vec.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc README
index c22bb9c,b9a075d..6159a05
--- a/README
+++ b/README
@@@ -1,7 -1,7 +1,11 @@@
l i b Q G L V i e w e r
++<<<<<<< HEAD
+ Version 2.6.1. Packaged on January 22, 2015
++=======
+ Version 2.6.3. Packaged on June 24, 2015
++>>>>>>> upstream/2.6.3+dfsg1
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
diff --cc designerPlugin/designerPlugin.pro
index ff2af95,4664044..46618ae
--- a/designerPlugin/designerPlugin.pro
+++ b/designerPlugin/designerPlugin.pro
@@@ -39,301 -39,4 +39,305 @@@ contains( QT_VERSION, "^5.*" )
}
}
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in .. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in .. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples/examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc designerPlugin/qglviewerPlugin.Qt3.cpp
index 8e7e55b,a4ffd18..3b93c19
--- a/designerPlugin/qglviewerPlugin.Qt3.cpp
+++ b/designerPlugin/qglviewerPlugin.Qt3.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc designerPlugin/qglviewerPlugin.Qt3.h
index 986dfdc,c63c47f..74fdd15
--- a/designerPlugin/qglviewerPlugin.Qt3.h
+++ b/designerPlugin/qglviewerPlugin.Qt3.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc designerPlugin/qglviewerPlugin.cpp
index 7d642b8,5391356..456708e
--- a/designerPlugin/qglviewerPlugin.cpp
+++ b/designerPlugin/qglviewerPlugin.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc designerPlugin/qglviewerPlugin.h
index f6aa3b5,78df6e2..e415b9c
--- a/designerPlugin/qglviewerPlugin.h
+++ b/designerPlugin/qglviewerPlugin.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc doc/changeLog-1.html
index 4a88208,e38f9cb..e3b4118
--- a/doc/changeLog-1.html
+++ b/doc/changeLog-1.html
@@@ -870,7 -870,7 +870,11 @@@ Please send any comment, suggestion or
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/changeLog.html
index bbe1da3,83bf76a..deb0520
--- a/doc/changeLog.html
+++ b/doc/changeLog.html
@@@ -33,11 -33,26 +33,34 @@@
<h1>Change Log</h1>
++<<<<<<< HEAD
+<h2>Jan 22nd 2015 - 2.6.1</h2>
+<b>Bug fixes or improvements</b>
+<ul>
+ <li>Bug fix in <code>Camera::pointUnderPixel()</code> (thanks Che).</li>
+ <li><i>terrain</i> contrib example deprecated.</li>
++=======
+ <h2>Jun 23rd 2015 - 2.6.3</h2>
+ <b>Bug fixes or improvements</b>
+ <ul>
+ <li>The library is now always built in the <code>QGLViewer</code> directory. The examples' pro files are simplified and more versatile.</li>
+ <li>Add some <code>libGlu</code> dependency in examples that rely on it (thanks Brice).</li>
+ </ul>
+
+
+ <h2>Jan 23nd 2015 - 2.6.2</h2>
+ <b>Bug fixes or improvements</b>
+ <ul>
+ <li>Fix <code>qreal</code> issue in <code>Quaternion::FromRotationMatrix()</code> (thanks Che, again).</li>
+ </ul>
+
+
+ <h2>Jan 22nd 2015 - 2.6.1</h2>
+ <b>Bug fixes or improvements</b>
+ <ul>
+ <li>Bug fix in <code>Camera::pointUnderPixel()</code> introduced by the switch to qreal (thanks Che).</li>
+ <li><i>terrain</i> contrib example is deprecated.</li>
++>>>>>>> upstream/2.6.3+dfsg1
</ul>
@@@ -46,7 -61,7 +69,11 @@@
<ul>
<li>The entire API now consistently uses the <code>qreal</code> (i.e <code>double</code>) type for floating point numbers.<br/>
This should not break code compatibility since types will mostly get automatically converted.<br/>
++<<<<<<< HEAD
+ Update your code if you use one of the <code>getX(qreal & x)</code> methods, which take a reference as a parameter, which type needs to be changed to <code>qreal</code>.
++=======
+ Update your code if you use one of the <code>getX(qreal & x)</code> methods, which take a reference as a parameter, and which type needs to be changed to <code>qreal</code>.
++>>>>>>> upstream/2.6.3+dfsg1
</li>
</ul>
@@@ -640,7 -655,7 +667,11 @@@ Please send any comment, suggestion or
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/commercial.html
index d062b09,b063082..bf69a3b
--- a/doc/commercial.html
+++ b/doc/commercial.html
@@@ -60,7 -60,7 +60,11 @@@ The net price of a commercial license i
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/compilation.html
index c879c1d,a94f4ca..1df0d7c
--- a/doc/compilation.html
+++ b/doc/compilation.html
@@@ -79,7 -79,7 +79,11 @@@ The <code>QGLViewer2.dll</code> (or <co
<ul>
<li>Copy it in a shared standard library directory such as <code>C:\Windows\System32</code>,</li>
<li>or copy it in each application's directory,</li>
++<<<<<<< HEAD
+ <li>or add the path to the dlls using <code>set PATH=%PATH%;C:\Users\...\libQGLViewer-2.6.1\QGLViewer\release</code></li>
++=======
+ <li>or add the path to the dlls using <code>set PATH=%PATH%;C:\Users\...\libQGLViewer-2.6.3\QGLViewer\release</code></li>
++>>>>>>> upstream/2.6.3+dfsg1
</ul>
<!--
@@@ -282,15 -282,15 +286,27 @@@ HEADERS = myViewer.
SOURCES = myViewer.cpp main.cpp
# Windows
++<<<<<<< HEAD
+INCLUDEPATH *= C:/Users/login/Documents/libQGLViewer-2.6.1
+LIBS *= -LC:/Users/login/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Linux
+INCLUDEPATH *= /home/login/Documents/libQGLViewer-2.6.1
+LIBS *= -L/home/login/libQGLViewer-2.6.1/QGLViewer -lQGLViewer
+
+# Mac
+INCLUDEPATH *= /Users/login/Documents/libQGLViewer-2.6.1
++=======
+ INCLUDEPATH *= C:/Users/login/Documents/libQGLViewer-2.6.3
+ LIBS *= -LC:/Users/login/Documents/libQGLViewer-2.6.3/QGLViewer -lQGLViewer2
+
+ # Linux
+ INCLUDEPATH *= /home/login/Documents/libQGLViewer-2.6.3
+ LIBS *= -L/home/login/libQGLViewer-2.6.3/QGLViewer -lQGLViewer
+
+ # Mac
+ INCLUDEPATH *= /Users/login/Documents/libQGLViewer-2.6.3
++>>>>>>> upstream/2.6.3+dfsg1
LIBS *= -F/Users/login/Library/Frameworks -framework QGLViewer
</pre>
@@@ -344,7 -344,7 +360,11 @@@ Please <a href="mailto:contact at libqglvi
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/developer.html
index ca308b4,50599a7..ee0024e
--- a/doc/developer.html
+++ b/doc/developer.html
@@@ -108,7 -108,7 +108,11 @@@ as they are, which features are in the
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/download.html
index f351a91,fba3f05..b1c41f2
--- a/doc/download.html
+++ b/doc/download.html
@@@ -74,7 -75,7 +75,11 @@@ href="http://www.libqglviewer.com/downl
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/download_statistics.html
index eab50bf,622fda4..afef206
--- a/doc/download_statistics.html
+++ b/doc/download_statistics.html
@@@ -56,7 -56,7 +56,11 @@@ These are the download statistics of th
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/dualLicensing.html
index 425f95d,8b3799e..0461d46
--- a/doc/dualLicensing.html
+++ b/doc/dualLicensing.html
@@@ -72,7 -72,7 +72,11 @@@ As a special exception to the terms an
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/animation.html
index b425e21,c78af5b..fdf2c64
--- a/doc/examples/animation.html
+++ b/doc/examples/animation.html
@@@ -199,7 -199,7 +199,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/callback.html
index 4f76190,85e959f..46ec62b
--- a/doc/examples/callback.html
+++ b/doc/examples/callback.html
@@@ -156,7 -156,7 +156,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/cameraLight.html
index 3669c91,bb533f5..52fac44
--- a/doc/examples/cameraLight.html
+++ b/doc/examples/cameraLight.html
@@@ -178,7 -178,7 +178,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/clippingPlane.html
index 0088abc,fef9fda..13bdefb
--- a/doc/examples/clippingPlane.html
+++ b/doc/examples/clippingPlane.html
@@@ -181,7 -181,7 +181,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/constrainedCamera.html
index 3e3b27c,bd26395..4c3ceb1
--- a/doc/examples/constrainedCamera.html
+++ b/doc/examples/constrainedCamera.html
@@@ -293,7 -293,7 +293,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/constrainedFrame.html
index 19717d6,54c3494..3c4a278
--- a/doc/examples/constrainedFrame.html
+++ b/doc/examples/constrainedFrame.html
@@@ -316,7 -316,7 +316,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/contribs.html
index 081e8b7,072c6e9..74665bc
--- a/doc/examples/contribs.html
+++ b/doc/examples/contribs.html
@@@ -299,7 -299,7 +299,11 @@@ a short description is here given, the
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/drawLight.html
index 75a713e,7568fe0..8295876
--- a/doc/examples/drawLight.html
+++ b/doc/examples/drawLight.html
@@@ -217,7 -217,7 +217,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/fastDraw.html
index ea27804,33211a2..b8181b2
--- a/doc/examples/fastDraw.html
+++ b/doc/examples/fastDraw.html
@@@ -163,7 -163,7 +163,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/frameTransform.html
index 54d68d6,96d2d46..dc9b14c
--- a/doc/examples/frameTransform.html
+++ b/doc/examples/frameTransform.html
@@@ -176,7 -176,7 +176,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/frustumCulling.html
index f44dea9,fe2f11b..35c95c8
--- a/doc/examples/frustumCulling.html
+++ b/doc/examples/frustumCulling.html
@@@ -361,7 -361,7 +361,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/index.html
index 9af14db,9320871..4028c1c
--- a/doc/examples/index.html
+++ b/doc/examples/index.html
@@@ -251,7 -251,7 +251,11 @@@ the philosophy of the library. See als
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/interface.html
index 9f14b40,21de6c2..e0bdd54
--- a/doc/examples/interface.html
+++ b/doc/examples/interface.html
@@@ -157,7 -157,7 +157,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/keyFrames.html
index 1672cf2,d54aa0e..8533368
--- a/doc/examples/keyFrames.html
+++ b/doc/examples/keyFrames.html
@@@ -230,7 -230,7 +230,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/keyboardAndMouse.html
index b39f18d,f9a0f76..761c3bc
--- a/doc/examples/keyboardAndMouse.html
+++ b/doc/examples/keyboardAndMouse.html
@@@ -301,7 -301,7 +301,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/luxo.html
index 6cc1519,d84f6a4..0331065
--- a/doc/examples/luxo.html
+++ b/doc/examples/luxo.html
@@@ -377,7 -380,7 +380,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/manipulatedFrame.html
index 2e9d1cb,72f4fc4..f7b5149
--- a/doc/examples/manipulatedFrame.html
+++ b/doc/examples/manipulatedFrame.html
@@@ -192,7 -192,7 +192,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/mouseGrabber.html
index aa04cb5,f84e1c4..913a0c0
--- a/doc/examples/mouseGrabber.html
+++ b/doc/examples/mouseGrabber.html
@@@ -292,7 -292,7 +292,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/multiSelect.html
index af63364,62b5c20..3d79084
--- a/doc/examples/multiSelect.html
+++ b/doc/examples/multiSelect.html
@@@ -461,7 -464,7 +464,11 @@@ void Object::draw() cons
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/multiView.html
index 5a9b701,4e1bd70..b10f061
--- a/doc/examples/multiView.html
+++ b/doc/examples/multiView.html
@@@ -180,7 -180,7 +180,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/overpainting.html
index 1acb774,249f02f..e1818d9
--- a/doc/examples/overpainting.html
+++ b/doc/examples/overpainting.html
@@@ -210,7 -210,7 +210,11 @@@ QString Viewer::helpString() cons
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/screenCoordSystem.html
index f60567b,463074f..567a69b
--- a/doc/examples/screenCoordSystem.html
+++ b/doc/examples/screenCoordSystem.html
@@@ -203,7 -206,7 +206,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/select.html
index aa97394,6c6307f..686cdbb
--- a/doc/examples/select.html
+++ b/doc/examples/select.html
@@@ -219,7 -219,7 +219,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/simpleViewer.html
index 83df587,d777bb8..464a3fa
--- a/doc/examples/simpleViewer.html
+++ b/doc/examples/simpleViewer.html
@@@ -158,7 -158,7 +158,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/standardCamera.html
index c2f4159,680688a..fe2adb8
--- a/doc/examples/standardCamera.html
+++ b/doc/examples/standardCamera.html
@@@ -399,7 -399,7 +399,11 @@@ QString Viewer::helpString() cons
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/examples/stereoViewer.html
index 14fd017,57b63e2..7dde1b5
--- a/doc/examples/stereoViewer.html
+++ b/doc/examples/stereoViewer.html
@@@ -150,7 -150,7 +150,11 @@@ int main(int argc, char** argv
<p>
<a href="http://validator.w3.org/check/referer"><img src="../images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="../images/css.gif" width="88" height="31" alt="Valid CSS!"/></a>
++<<<<<<< HEAD
+<i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/faq.html
index f3604ee,8d41cb1..99d1d48
--- a/doc/faq.html
+++ b/doc/faq.html
@@@ -124,7 -124,7 +124,11 @@@ and will be added to this page. See als
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/features.html
index baf4d9a,8e2a174..d705d90
--- a/doc/features.html
+++ b/doc/features.html
@@@ -156,7 -156,7 +156,11 @@@ a new feature
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/index.html
index 0a14e05,b058ccb..7f6a6e1
--- a/doc/index.html
+++ b/doc/index.html
@@@ -92,37 -92,28 +92,53 @@@ commercial applications can apply for
<table style="width:90%; margin-left:50px; border:1px solid #AAF; background-color:#DDE" cellspacing="8" cellpadding="8">
<tr>
++<<<<<<< HEAD
+ <td><b>Jan 22nd, 2015</b><br/><a href="changeLog.html">Version 2.6.1</a></td>
+ <td>Bug fix in <code>Camera::pointUnderPixel()</code>.</td>
+</tr>
+
+
+<tr>
+ <td><b>Nov 17th, 2014</b><br/><a href="changeLog.html">Version 2.6.0</a></td>
+ <td>The entire API now consistently uses the <code>qreal</code> (i.e <code>double</code>) type for floating point numbers.</td>
+</tr>
+
+
+<tr>
+ <td><b>Nov 6th, 2014</b><br/><a href="changeLog.html">Version 2.5.4</a></td>
+ <td>More minor compilation warning and error fixes.</td>
+</tr>
+
+<tr>
+ <td><b>Sep 1st, 2014</b><br/><a href="changeLog.html">Version 2.5.3</a></td>
+ <td>Minor compilation warning and error fixes for recent compilers.</td>
++=======
+ <td><b>Jun 23rd, 2015</b><br/><a href="changeLog.html">Version 2.6.3</a></td>
+ <td>The library is now always built in the <code>QGLViewer</code> directory.</td>
++>>>>>>> upstream/2.6.3+dfsg1
</tr>
+
+ <tr>
+ <td><b>Jan 22nd, 2015</b><br/><a href="changeLog.html">Version 2.6.2</a></td>
+ <td>Fix <code>qreal</code> issue in <code>Quaternion::FromRotationMatrix()</code>.</td>
+ </tr>
+
+
<tr>
- <td><b>Mar 5th, 2014</b><br/><a href="changeLog.html">Version 2.5.2</a></td>
- <td><code>RevolveAroundPoint</code> renamed <code>PivotPoint</code><br/>New camera constrainted rotation mode around the sceneUpVector.</td>
+ <td><b>Jan 22nd, 2015</b><br/><a href="changeLog.html">Version 2.6.1</a></td>
+ <td>Bug fix in <code>Camera::pointUnderPixel()</code>.</td>
</tr>
++<<<<<<< HEAD
++=======
+
<tr>
- <td><b>Feb 12th, 2014</b><br/><a href="changeLog.html">Version 2.5.1</a></td>
- <td>New binding methods changes.<br/>Qt 3 no longer supported.<br/>Include dependencies cleaned-up.<br/>Revolve around point is set to point under cursor, or reset to scene center if there is no point.</td>
+ <td><b>Nov 17th, 2014</b><br/><a href="changeLog.html">Version 2.6.0</a></td>
+ <td>The entire API now consistently uses the <code>qreal</code> (i.e <code>double</code>) type for floating point numbers.</td>
</tr>
++>>>>>>> upstream/2.6.3+dfsg1
</table>
<p>
@@@ -139,7 -130,7 +155,11 @@@ Related pages : <a href="http://pyqglvi
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/installUnix.html
index 54ac5d3,78a050a..734d545
--- a/doc/installUnix.html
+++ b/doc/installUnix.html
@@@ -50,7 -50,7 +50,11 @@@ Unix system
<a name="mac"></a>
<h2><img src="images/mac.png" width="55" height="54" alt="mac"/> Mac OS X</h2>
++<<<<<<< HEAD
+<a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.1.tar.gz" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.1.tar.gz']);">Download</a> and decompress the sources, then open the <code>libQGLViewer-2.6.1/QGLViewer</code> folder.
++=======
+ <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.3.tar.gz" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.3.tar.gz']);">Download</a> and decompress the sources, then open the <code>libQGLViewer-2.6.3/QGLViewer</code> folder.
++>>>>>>> upstream/2.6.3+dfsg1
<h3>Using Qt Creator</h3>
Open <code>QGLViewer.pro</code> and "build all".
@@@ -58,13 -58,13 +62,21 @@@
<h3>Using Xcode</h3>
Create the Xcode project by running these lines in a terminal:
<pre>
++<<<<<<< HEAD
+cd path/to/libQGLViewer-2.6.1/QGLViewer
++=======
+ cd path/to/libQGLViewer-2.6.3/QGLViewer
++>>>>>>> upstream/2.6.3+dfsg1
qmake -spec macx-xcode
</pre>
<h3>Using <code>make</code></h3>
<pre>
++<<<<<<< HEAD
+cd path/to/libQGLViewer-2.6.1/QGLViewer
++=======
+ cd path/to/libQGLViewer-2.6.3/QGLViewer
++>>>>>>> upstream/2.6.3+dfsg1
qmake -spec macx-g++
make
</pre>
@@@ -170,19 -170,19 +182,33 @@@ It should be available from standard de
<p>As an alternative, you can use these debian packages generated using Alien and depending on the latest Qt version :</p>
<pre>
++<<<<<<< HEAD
+apt-get install <a href="http://www.libqglviewer.com/src/libqglviewer_2.6.1_i386.deb" onclick="javascript: _gaq.push(['_trackPageview', 'libqglviewer_2.6.1_i386.deb']);">libqglviewer_2.6.1_i386.deb</a> <a href="http://www.libqglviewer.com/src/libqglviewer-devel_2.6.1_i386.deb" onclick="javascript: _gaq.push(['_trackPageview', 'libqglviewer-devel_2.6.1_i386.deb']);">libqglviewer-devel_2.6.1_i386.deb</a>
++=======
+ apt-get install <a href="http://www.libqglviewer.com/src/libqglviewer_2.6.3_i386.deb" onclick="javascript: _gaq.push(['_trackPageview', 'libqglviewer_2.6.3_i386.deb']);">libqglviewer_2.6.3_i386.deb</a> <a href="http://www.libqglviewer.com/src/libqglviewer-devel_2.6.3_i386.deb" onclick="javascript: _gaq.push(['_trackPageview', 'libqglviewer-devel_2.6.3_i386.deb']);">libqglviewer-devel_2.6.3_i386.deb</a>
++>>>>>>> upstream/2.6.3+dfsg1
</pre>
<h3>RPM packages</h3>
Use the following command line:
<pre>
++<<<<<<< HEAD
+rpm -Uvh <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.1.i386.rpm" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.1.i386.rpm']);">libQGLViewer-2.6.1.i386.rpm</a> <a href="http://www.libqglviewer.com/src/libQGLViewer-devel-2.6.1.i386.rpm" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-devel-2.6.1.i386.rpm']);">libQGLViewer-devel-2.6.1.i386.rpm</a>
+</pre>
+You can also re-compile the RPM for optimal results:
+<pre>
+rpmbuild - !!!!!!!!!!!!!!!!!!!!!! FIXME !!!!!!!!!!!!!!!!!!!!! -rebuild <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.1.src.rpm" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.1.src.rpm']);">libQGLViewer-2.6.1.src.rpm</a>
+cd /usr/src/RPM/RPMS/i?86/ (or /usr/src/redhat/RPMS/i?86, see the rpmbuild last log lines)
+rpm -Uvh libQGLViewer-*2.6.1.i?86.rpm
++=======
+ rpm -Uvh <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.3.i386.rpm" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.3.i386.rpm']);">libQGLViewer-2.6.3.i386.rpm</a> <a href="http://www.libqglviewer.com/src/libQGLViewer-devel-2.6.3.i386.rpm" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-devel-2.6.3.i386.rpm']);">libQGLViewer-devel-2.6.3.i386.rpm</a>
+ </pre>
+ You can also re-compile the RPM for optimal results:
+ <pre>
+ rpmbuild - !!!!!!!!!!!!!!!!!!!!!! FIXME !!!!!!!!!!!!!!!!!!!!! -rebuild <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.3.src.rpm" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.3.src.rpm']);">libQGLViewer-2.6.3.src.rpm</a>
+ cd /usr/src/RPM/RPMS/i?86/ (or /usr/src/redhat/RPMS/i?86, see the rpmbuild last log lines)
+ rpm -Uvh libQGLViewer-*2.6.3.i?86.rpm
++>>>>>>> upstream/2.6.3+dfsg1
</pre>
<p>
@@@ -196,11 -196,11 +222,19 @@@ Change the RPM installation prefix, sa
Use the <a href="http://www.freshports.org/graphics/libqglviewer/">FreeBSD port</a>.
-->
++<<<<<<< HEAD
+<a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.1.tar.gz" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.1.tar.gz']);">Download</a> and decompress the sources, then go to the <code>libQGLViewer-2.6.1/QGLViewer</code> folder.
+
+<pre>
+tar -xzf <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.1.tar.gz" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.1.tar.gz']);">libQGLViewer-2.6.1.tar.gz</a>
+cd libQGLViewer-2.6.1/QGLViewer
++=======
+ <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.3.tar.gz" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.3.tar.gz']);">Download</a> and decompress the sources, then go to the <code>libQGLViewer-2.6.3/QGLViewer</code> folder.
+
+ <pre>
+ tar -xzf <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.3.tar.gz" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.3.tar.gz']);">libQGLViewer-2.6.3.tar.gz</a>
+ cd libQGLViewer-2.6.3/QGLViewer
++>>>>>>> upstream/2.6.3+dfsg1
</pre>
<h3>Using Qt Creator</h3>
@@@ -215,7 -215,7 +249,11 @@@ sudo make install [optional
The following files are installed (you need root privileges to <code>install</code>, since these are system directories):
<ul>
++<<<<<<< HEAD
+<li>The library (<code>libQGLViewer-2.6.1.so</code>) in <code>/usr/lib</code></li>
++=======
+ <li>The library (<code>libQGLViewer-2.6.3.so</code>) in <code>/usr/lib</code></li>
++>>>>>>> upstream/2.6.3+dfsg1
<li>The header files and designer plugin code in <code>/usr/include/QGLViewer</code></li>
<li>The documentation and the examples in <code>/usr/share/doc/QGLViewer</code></li>
</ul>
@@@ -422,7 -422,7 +460,11 @@@ encounter specific installation problem
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/installWindows.html
index 36e4dcd,8f3acf0..42b3ffe
--- a/doc/installWindows.html
+++ b/doc/installWindows.html
@@@ -56,7 -56,7 +56,11 @@@ commercial application, you need to pur
Make sure your Qt installation is up to date and running. Try building one of the Qt OpenGL examples first.
<p>
++<<<<<<< HEAD
+Then download and unzip <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.1.zip" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.1.zip']);">libQGLViewer-2.6.1.zip</a>.
++=======
+ Then download and unzip <a href="http://www.libqglviewer.com/src/libQGLViewer-2.6.3.zip" onclick="javascript: _gaq.push(['_trackPageview', 'libQGLViewer-2.6.3.zip']);">libQGLViewer-2.6.3.zip</a>.
++>>>>>>> upstream/2.6.3+dfsg1
</p>
Depending on your environment:
@@@ -66,7 -66,7 +70,11 @@@
<li><a name="mingw"></a><b>MinGW</b> (available when you install the OpenSource Qt version):
launch the <i>Qt Command Prompt</i> from the <i>Start</i> menu and type:
<pre>
++<<<<<<< HEAD
+cd \path\to\libQGLViewer-2.6.1\QGLViewer
++=======
+ cd \path\to\libQGLViewer-2.6.3\QGLViewer
++>>>>>>> upstream/2.6.3+dfsg1
qmake
mingw32-make
</pre></li>
@@@ -167,7 -167,7 +175,11 @@@ Please <a href="mailto:contact at libqglvi
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body>
diff --cc doc/introduction.html
index d94c5a3,d37d6a4..8525cb7
--- a/doc/introduction.html
+++ b/doc/introduction.html
@@@ -143,7 -143,7 +143,11 @@@ color="4444FF">) )</font><font color="4
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/keyboard.html
index 6898735,7c537cb..5b0e4da
--- a/doc/keyboard.html
+++ b/doc/keyboard.html
@@@ -228,7 -228,7 +228,11 @@@ path 1..12), </li
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/mouse.html
index 410145a,545940e..c477985
--- a/doc/mouse.html
+++ b/doc/mouse.html
@@@ -341,6 -341,6 +341,10 @@@ in the standard list
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc doc/refManual/annotated.html
index 5ee69e4,9108b62..16c5dca
--- a/doc/refManual/annotated.html
+++ b/doc/refManual/annotated.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -110,9 -111,9 +115,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/camera_8cpp.html
index fa0d0b3,dd21de3..24bf21c
--- a/doc/refManual/camera_8cpp.html
+++ b/doc/refManual/camera_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/camera_8h.html
index dd77fc6,91f05a7..4e7f5e3
--- a/doc/refManual/camera_8h.html
+++ b/doc/refManual/camera_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -109,9 -110,9 +114,13 @@@ Namespaces</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classQGLViewer-members.html
index 2b21f67,a1d5361..78c8a87
--- a/doc/refManual/classQGLViewer-members.html
+++ b/doc/refManual/classQGLViewer-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -323,9 -324,9 +328,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classQGLViewer.html
index 835cf95,d90a021..7d9b60d
--- a/doc/refManual/classQGLViewer.html
+++ b/doc/refManual/classQGLViewer.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -5972,9 -5973,9 +5977,13 @@@ directory does not exist, it will be cr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classes.html
index 8f2cb0a,8025fef..c0627e9
--- a/doc/refManual/classes.html
+++ b/doc/refManual/classes.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -113,9 -114,9 +118,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1AxisPlaneConstraint-members.html
index e9c2abd,e8167e5..ada8c3c
--- a/doc/refManual/classqglviewer_1_1AxisPlaneConstraint-members.html
+++ b/doc/refManual/classqglviewer_1_1AxisPlaneConstraint-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -118,9 -119,9 +123,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1AxisPlaneConstraint.html
index 2b2a80c,ec84a65..cbcd272
--- a/doc/refManual/classqglviewer_1_1AxisPlaneConstraint.html
+++ b/doc/refManual/classqglviewer_1_1AxisPlaneConstraint.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -519,9 -520,9 +524,13 @@@ Rotation constraint</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Camera-members.html
index 48b8d1a,6b4968b..8a4569a
--- a/doc/refManual/classqglviewer_1_1Camera-members.html
+++ b/doc/refManual/classqglviewer_1_1Camera-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -201,9 -202,9 +206,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Camera.html
index b1bc4fc,cbfdf9d..8fd6a30
--- a/doc/refManual/classqglviewer_1_1Camera.html
+++ b/doc/refManual/classqglviewer_1_1Camera.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -1011,7 -1012,7 +1016,11 @@@ XML representation</h2></td></tr
</tr>
</table>
</div><div class="memdoc">
++<<<<<<< HEAD
+<p>Overloaded getModelViewMatrix(GLdouble m[16]) method using a <code>qreal</code> array instead. </p>
++=======
+ <p>Overloaded getModelViewMatrix(GLdouble m[16]) method using a <code>GLfloat</code> array instead. </p>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</div>
@@@ -1049,7 -1050,7 +1058,11 @@@
</tr>
</table>
</div><div class="memdoc">
++<<<<<<< HEAD
+<p>Overloaded getModelViewProjectionMatrix(GLdouble m[16]) method using a <code>qreal</code> array instead. </p>
++=======
+ <p>Overloaded getModelViewProjectionMatrix(GLdouble m[16]) method using a <code>GLfloat</code> array instead. </p>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</div>
@@@ -1155,7 -1156,7 +1168,11 @@@
</tr>
</table>
</div><div class="memdoc">
++<<<<<<< HEAD
+<p>Overloaded getProjectionMatrix(GLdouble m[16]) method using a <code>qreal</code> array instead. </p>
++=======
+ <p>Overloaded getProjectionMatrix(GLdouble m[16]) method using a <code>GLfloat</code> array instead. </p>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</div>
@@@ -2991,9 -2992,9 +3008,13 @@@ If you use several OpenGL contexts and
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1CameraConstraint-members.html
index 00342f1,26d5679..7c0b822
--- a/doc/refManual/classqglviewer_1_1CameraConstraint-members.html
+++ b/doc/refManual/classqglviewer_1_1CameraConstraint-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -121,9 -122,9 +126,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1CameraConstraint.html
index 4a795c5,cdf2a19..b3dcf24
--- a/doc/refManual/classqglviewer_1_1CameraConstraint.html
+++ b/doc/refManual/classqglviewer_1_1CameraConstraint.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -298,9 -299,9 +303,13 @@@ Additional Inherited Members</h2></td><
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Constraint-members.html
index 3b03996,00d7c81..4988c0d
--- a/doc/refManual/classqglviewer_1_1Constraint-members.html
+++ b/doc/refManual/classqglviewer_1_1Constraint-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -101,9 -102,9 +106,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Constraint.html
index 6babc10,065fc5c..6ce7fd3
--- a/doc/refManual/classqglviewer_1_1Constraint.html
+++ b/doc/refManual/classqglviewer_1_1Constraint.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -259,9 -260,9 +264,13 @@@ Public Member Functions</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Frame-members.html
index fe93713,7478c9f..c9f55ea
--- a/doc/refManual/classqglviewer_1_1Frame-members.html
+++ b/doc/refManual/classqglviewer_1_1Frame-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -182,9 -183,9 +187,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Frame.html
index 09b55be,9e13fad..0a59f48
--- a/doc/refManual/classqglviewer_1_1Frame.html
+++ b/doc/refManual/classqglviewer_1_1Frame.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -2448,9 -2449,9 +2453,13 @@@ XML representation</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1KeyFrameInterpolator-members.html
index 2258199,34dcbce..0634755
--- a/doc/refManual/classqglviewer_1_1KeyFrameInterpolator-members.html
+++ b/doc/refManual/classqglviewer_1_1KeyFrameInterpolator-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -132,9 -133,9 +137,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1KeyFrameInterpolator.html
index de7275a,8a654ed..1d84046
--- a/doc/refManual/classqglviewer_1_1KeyFrameInterpolator.html
+++ b/doc/refManual/classqglviewer_1_1KeyFrameInterpolator.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -1079,9 -1080,9 +1084,13 @@@ XML representation</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1LocalConstraint-members.html
index 53a1949,91bba3d..cf8f5d5
--- a/doc/refManual/classqglviewer_1_1LocalConstraint-members.html
+++ b/doc/refManual/classqglviewer_1_1LocalConstraint-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -119,9 -120,9 +124,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1LocalConstraint.html
index a2e8c36,1c48b48..27db2c9
--- a/doc/refManual/classqglviewer_1_1LocalConstraint.html
+++ b/doc/refManual/classqglviewer_1_1LocalConstraint.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -253,9 -254,9 +258,13 @@@ Additional Inherited Members</h2></td><
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1ManipulatedCameraFrame-members.html
index 0d7f288,9226a72..435f0fe
--- a/doc/refManual/classqglviewer_1_1ManipulatedCameraFrame-members.html
+++ b/doc/refManual/classqglviewer_1_1ManipulatedCameraFrame-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -235,9 -236,9 +240,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1ManipulatedCameraFrame.html
index a1d6f87,bd60fef..76f4271
--- a/doc/refManual/classqglviewer_1_1ManipulatedCameraFrame.html
+++ b/doc/refManual/classqglviewer_1_1ManipulatedCameraFrame.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -904,9 -904,9 +908,13 @@@ Additional Inherited Members</h2></td><
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1ManipulatedFrame-members.html
index 9df6f0a,435353d..6cd6ac6
--- a/doc/refManual/classqglviewer_1_1ManipulatedFrame-members.html
+++ b/doc/refManual/classqglviewer_1_1ManipulatedFrame-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -221,9 -222,9 +226,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1ManipulatedFrame.html
index fb6c5e4,8ead319..1f5274d
--- a/doc/refManual/classqglviewer_1_1ManipulatedFrame.html
+++ b/doc/refManual/classqglviewer_1_1ManipulatedFrame.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -1244,9 -1244,9 +1248,13 @@@ Additional Inherited Members</h2></td><
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1MouseGrabber-members.html
index a433544,2187602..d8f163e
--- a/doc/refManual/classqglviewer_1_1MouseGrabber-members.html
+++ b/doc/refManual/classqglviewer_1_1MouseGrabber-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -113,9 -114,9 +118,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1MouseGrabber.html
index e453faf,6dbd04e..1c8ab78
--- a/doc/refManual/classqglviewer_1_1MouseGrabber.html
+++ b/doc/refManual/classqglviewer_1_1MouseGrabber.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -630,9 -630,9 +634,13 @@@ Mouse event handlers</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Quaternion-members.html
index ea96bd8,931a0fc..c4af9d8
--- a/doc/refManual/classqglviewer_1_1Quaternion-members.html
+++ b/doc/refManual/classqglviewer_1_1Quaternion-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -143,9 -144,9 +148,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Quaternion.html
index 6b131b0,de476eb..0bf03a9
--- a/doc/refManual/classqglviewer_1_1Quaternion.html
+++ b/doc/refManual/classqglviewer_1_1Quaternion.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -1341,9 -1342,9 +1346,13 @@@ case of numerical drift with small rota
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Vec-members.html
index 0a8360f,9b080f8..dd462d9
--- a/doc/refManual/classqglviewer_1_1Vec-members.html
+++ b/doc/refManual/classqglviewer_1_1Vec-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -137,9 -138,9 +142,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1Vec.html
index 8e50bdf,4174070..81b5c2b
--- a/doc/refManual/classqglviewer_1_1Vec.html
+++ b/doc/refManual/classqglviewer_1_1Vec.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -1175,9 -1176,9 +1180,13 @@@ Output stream</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1WorldConstraint-members.html
index abd9bbf,7a6c0d1..3032c40
--- a/doc/refManual/classqglviewer_1_1WorldConstraint-members.html
+++ b/doc/refManual/classqglviewer_1_1WorldConstraint-members.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -119,9 -120,9 +124,13 @@@ var searchBox = new SearchBox("searchBo
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/classqglviewer_1_1WorldConstraint.html
index 4688de7,1d9ab8c..d4cf698
--- a/doc/refManual/classqglviewer_1_1WorldConstraint.html
+++ b/doc/refManual/classqglviewer_1_1WorldConstraint.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -253,9 -254,9 +258,13 @@@ Additional Inherited Members</h2></td><
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/config_8h.html
index 1ba7773,b2deb01..e9f3a32
--- a/doc/refManual/config_8h.html
+++ b/doc/refManual/config_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -96,7 -97,7 +101,11 @@@ var searchBox = new SearchBox("searchBo
<table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
Macros</h2></td></tr>
++<<<<<<< HEAD
+<tr class="memitem:a31753aa03177ca4c55bb1054ceb23107"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="config_8h.html#a31753aa03177ca4c55bb1054ceb23107">QGLVIEWER_VERSION</a> 0x020601</td></tr>
++=======
+ <tr class="memitem:a31753aa03177ca4c55bb1054ceb23107"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="config_8h.html#a31753aa03177ca4c55bb1054ceb23107">QGLVIEWER_VERSION</a> 0x020603</td></tr>
++>>>>>>> upstream/2.6.3+dfsg1
<tr class="separator:a31753aa03177ca4c55bb1054ceb23107"><td class="memSeparator" colspan="2"> </td></tr>
<tr class="memitem:a1e9c4d889526b73d9f4d5c688ae88c07"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="config_8h.html#a1e9c4d889526b73d9f4d5c688ae88c07">QT_CLEAN_NAMESPACE</a></td></tr>
<tr class="separator:a1e9c4d889526b73d9f4d5c688ae88c07"><td class="memSeparator" colspan="2"> </td></tr>
@@@ -121,7 -122,7 +130,11 @@@
<div class="memproto">
<table class="memname">
<tr>
++<<<<<<< HEAD
+ <td class="memname">#define QGLVIEWER_VERSION 0x020601</td>
++=======
+ <td class="memname">#define QGLVIEWER_VERSION 0x020603</td>
++>>>>>>> upstream/2.6.3+dfsg1
</tr>
</table>
</div><div class="memdoc">
@@@ -143,9 -144,9 +156,13 @@@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/constraint_8cpp.html
index a49d5b3,9c21dc8..f8590bd
--- a/doc/refManual/constraint_8cpp.html
+++ b/doc/refManual/constraint_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/constraint_8h.html
index 45aff13,e1c804b..c436fe1
--- a/doc/refManual/constraint_8h.html
+++ b/doc/refManual/constraint_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -121,9 -122,9 +126,13 @@@ Namespaces</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/dir_0d5ec90603fafeb6b6840b6051802ddc.html
index ba77885,9a199ba..40a52b2
--- a/doc/refManual/dir_0d5ec90603fafeb6b6840b6051802ddc.html
+++ b/doc/refManual/dir_0d5ec90603fafeb6b6840b6051802ddc.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -138,9 -139,9 +143,13 @@@ Files</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/domUtils_8h.html
index d688be4,4f44b48..05d60af
--- a/doc/refManual/domUtils_8h.html
+++ b/doc/refManual/domUtils_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/files.html
index d5aad32,466fd74..6c52b82
--- a/doc/refManual/files.html
+++ b/doc/refManual/files.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -117,9 -118,9 +122,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/frame_8cpp.html
index 5c26ec7,1ecbcdb..b02d12e
--- a/doc/refManual/frame_8cpp.html
+++ b/doc/refManual/frame_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/frame_8h.html
index 76ff6a6,3027437..ab08f42
--- a/doc/refManual/frame_8h.html
+++ b/doc/refManual/frame_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -109,9 -110,9 +114,13 @@@ Namespaces</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions.html
index e1f0b17,e0f1ca5..b0e6ac0
--- a/doc/refManual/functions.html
+++ b/doc/refManual/functions.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -195,9 -196,9 +200,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_b.html
index 24fe3e7,312a2ac..31f6fb6
--- a/doc/refManual/functions_b.html
+++ b/doc/refManual/functions_b.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -146,9 -147,9 +151,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_c.html
index 562b53b,df156c3..eebfd54
--- a/doc/refManual/functions_c.html
+++ b/doc/refManual/functions_c.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -239,9 -240,9 +244,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_d.html
index 992dd1d,609a9ab..a334456
--- a/doc/refManual/functions_d.html
+++ b/doc/refManual/functions_d.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -209,9 -210,9 +214,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_e.html
index 51719da,b87834a..264ebb7
--- a/doc/refManual/functions_e.html
+++ b/doc/refManual/functions_e.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -149,9 -150,9 +154,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_enum.html
index 2de4264,18bd8a2..16a6136
--- a/doc/refManual/functions_enum.html
+++ b/doc/refManual/functions_enum.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -115,9 -116,9 +120,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_eval.html
index 4a7d5eb,4deb3dc..68ef1d2
--- a/doc/refManual/functions_eval.html
+++ b/doc/refManual/functions_eval.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -331,9 -332,9 +336,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_f.html
index f6ffcb1,f6f0f08..d48870b
--- a/doc/refManual/functions_f.html
+++ b/doc/refManual/functions_f.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -186,9 -187,9 +191,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func.html
index c4c0a9c,f6c6daa..1025b2f
--- a/doc/refManual/functions_func.html
+++ b/doc/refManual/functions_func.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -181,9 -182,9 +186,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_b.html
index bf95e9b,89b037e..7647239
--- a/doc/refManual/functions_func_b.html
+++ b/doc/refManual/functions_func_b.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -144,9 -145,9 +149,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_c.html
index 48cca2c,086099a..d917519
--- a/doc/refManual/functions_func_c.html
+++ b/doc/refManual/functions_func_c.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -219,9 -220,9 +224,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_d.html
index 59c094d,7c57a7f..5d8acc6
--- a/doc/refManual/functions_func_d.html
+++ b/doc/refManual/functions_func_d.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -192,9 -193,9 +197,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_e.html
index 3bc0e34,bed56bb..6bf2552
--- a/doc/refManual/functions_func_e.html
+++ b/doc/refManual/functions_func_e.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -138,9 -139,9 +143,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_f.html
index fd31d2f,881abb1..41797f3
--- a/doc/refManual/functions_func_f.html
+++ b/doc/refManual/functions_func_f.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -172,9 -173,9 +177,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_g.html
index 72f48f2,960dc37..9f6639e
--- a/doc/refManual/functions_func_g.html
+++ b/doc/refManual/functions_func_g.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -244,9 -245,9 +249,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_h.html
index 94d81f4,6ed8152..0d583e2
--- a/doc/refManual/functions_func_h.html
+++ b/doc/refManual/functions_func_h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -150,9 -151,9 +155,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_i.html
index ce6df43,8dccfac..44913ca
--- a/doc/refManual/functions_func_i.html
+++ b/doc/refManual/functions_func_i.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -213,9 -214,9 +218,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_k.html
index 081f3f3,0965f5e..0e13051
--- a/doc/refManual/functions_func_k.html
+++ b/doc/refManual/functions_func_k.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -150,9 -151,9 +155,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_l.html
index 4ad303d,d7c769b..ee9e372
--- a/doc/refManual/functions_func_l.html
+++ b/doc/refManual/functions_func_l.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -168,9 -169,9 +173,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_m.html
index af0f60f,94d1c6b..21574b4
--- a/doc/refManual/functions_func_m.html
+++ b/doc/refManual/functions_func_m.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -197,9 -198,9 +202,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_n.html
index 37a7455,17b8468..dee006c
--- a/doc/refManual/functions_func_n.html
+++ b/doc/refManual/functions_func_n.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -145,9 -146,9 +150,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_o.html
index 1193f7d,aac7ae0..61b3e04
--- a/doc/refManual/functions_func_o.html
+++ b/doc/refManual/functions_func_o.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -177,9 -178,9 +182,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_p.html
index 424b84a,8c3407d..9399cdb
--- a/doc/refManual/functions_func_p.html
+++ b/doc/refManual/functions_func_p.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -188,9 -189,9 +193,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_q.html
index 737f163,8dea308..3da9fbb
--- a/doc/refManual/functions_func_q.html
+++ b/doc/refManual/functions_func_q.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -147,9 -148,9 +152,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_r.html
index 51c8b35,4deedf2..83b35bd
--- a/doc/refManual/functions_func_r.html
+++ b/doc/refManual/functions_func_r.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -178,9 -179,9 +183,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_s.html
index b5bd028,e32da43..d09fddf
--- a/doc/refManual/functions_func_s.html
+++ b/doc/refManual/functions_func_s.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -553,9 -554,9 +558,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_t.html
index 173c0e1,76ac902..1f824c2
--- a/doc/refManual/functions_func_t.html
+++ b/doc/refManual/functions_func_t.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -195,9 -196,9 +200,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_u.html
index 5bc9b65,daa4bc2..734a62b
--- a/doc/refManual/functions_func_u.html
+++ b/doc/refManual/functions_func_u.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -141,9 -142,9 +146,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_v.html
index cf98529,0d443ac..77193c7
--- a/doc/refManual/functions_func_v.html
+++ b/doc/refManual/functions_func_v.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -138,9 -139,9 +143,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_w.html
index 519f34c,bf52014..4a61500
--- a/doc/refManual/functions_func_w.html
+++ b/doc/refManual/functions_func_w.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -156,9 -157,9 +161,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_z.html
index 7f1a86d,80961ee..5563f7a
--- a/doc/refManual/functions_func_z.html
+++ b/doc/refManual/functions_func_z.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -147,9 -148,9 +152,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_func_~.html
index 26beb09,e647680..421ab32
--- a/doc/refManual/functions_func_~.html
+++ b/doc/refManual/functions_func_~.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -165,9 -166,9 +170,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_g.html
index e892eaf,c1e76f8..3737962
--- a/doc/refManual/functions_g.html
+++ b/doc/refManual/functions_g.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -246,9 -247,9 +251,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_h.html
index 951dcf6,9eb7243..82b7c4c
--- a/doc/refManual/functions_h.html
+++ b/doc/refManual/functions_h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -155,9 -156,9 +160,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_i.html
index be46124,878f08d..a084800
--- a/doc/refManual/functions_i.html
+++ b/doc/refManual/functions_i.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -218,9 -219,9 +223,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_k.html
index bc8926e,be6c6ce..336c3f4
--- a/doc/refManual/functions_k.html
+++ b/doc/refManual/functions_k.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -155,9 -156,9 +160,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_l.html
index 33d941d,0d16569..ea81b0b
--- a/doc/refManual/functions_l.html
+++ b/doc/refManual/functions_l.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -173,9 -174,9 +178,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_m.html
index c7c0ef1,a857d6e..577c0f9
--- a/doc/refManual/functions_m.html
+++ b/doc/refManual/functions_m.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -223,9 -224,9 +228,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_n.html
index c68ce9f,34e036f..ac128f8
--- a/doc/refManual/functions_n.html
+++ b/doc/refManual/functions_n.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -153,9 -154,9 +158,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_o.html
index 06e90fe,6b0bde7..8ba8656
--- a/doc/refManual/functions_o.html
+++ b/doc/refManual/functions_o.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -204,9 -205,9 +209,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_p.html
index 1005fd9,09eeaa3..f5d970f
--- a/doc/refManual/functions_p.html
+++ b/doc/refManual/functions_p.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -196,9 -197,9 +201,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_q.html
index a82af49,0508cb9..277882e
--- a/doc/refManual/functions_q.html
+++ b/doc/refManual/functions_q.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -149,9 -150,9 +154,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_r.html
index 3ea02f6,c163f58..d4ec3a4
--- a/doc/refManual/functions_r.html
+++ b/doc/refManual/functions_r.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -192,9 -193,9 +197,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_rela.html
index 22298a4,753b3e4..9ca4f88
--- a/doc/refManual/functions_rela.html
+++ b/doc/refManual/functions_rela.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -124,9 -125,9 +129,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_s.html
index 4b519e4,a9ad8dd..dd5b893
--- a/doc/refManual/functions_s.html
+++ b/doc/refManual/functions_s.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -579,9 -580,9 +584,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_t.html
index 4e0a506,378653d..8c31ffb
--- a/doc/refManual/functions_t.html
+++ b/doc/refManual/functions_t.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -206,9 -207,9 +211,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_u.html
index 764b2d6,a5afbf2..7256eaa
--- a/doc/refManual/functions_u.html
+++ b/doc/refManual/functions_u.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -143,9 -144,9 +148,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_v.html
index 976c872,b2958a0..f34093d
--- a/doc/refManual/functions_v.html
+++ b/doc/refManual/functions_v.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -140,9 -141,9 +145,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_vars.html
index f3b733a,097db3f..109f59f
--- a/doc/refManual/functions_vars.html
+++ b/doc/refManual/functions_vars.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -108,9 -109,9 +113,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_w.html
index 96dd8d2,1d476c3..69a8331
--- a/doc/refManual/functions_w.html
+++ b/doc/refManual/functions_w.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -158,9 -159,9 +163,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_x.html
index 133ae90,fbdbdd3..5c542a5
--- a/doc/refManual/functions_x.html
+++ b/doc/refManual/functions_x.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -134,9 -135,9 +139,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_y.html
index 6abf0dd,dce4527..8ec64cc
--- a/doc/refManual/functions_y.html
+++ b/doc/refManual/functions_y.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -134,9 -135,9 +139,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_z.html
index 4736de2,c76fbdf..bff37a5
--- a/doc/refManual/functions_z.html
+++ b/doc/refManual/functions_z.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -164,9 -165,9 +169,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/functions_~.html
index 9ef4158,f293f73..f6cc1d6
--- a/doc/refManual/functions_~.html
+++ b/doc/refManual/functions_~.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -167,9 -168,9 +172,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/globals.html
index b4ea5c4,9d221a2..ae282a9
--- a/doc/refManual/globals.html
+++ b/doc/refManual/globals.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -113,9 -114,9 +118,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/globals_defs.html
index 9e54223,6f68fbd..f097f32
--- a/doc/refManual/globals_defs.html
+++ b/doc/refManual/globals_defs.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -104,9 -105,9 +109,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/globals_func.html
index b337f3a,d0ee228..172a6a6
--- a/doc/refManual/globals_func.html
+++ b/doc/refManual/globals_func.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -104,9 -105,9 +109,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/hierarchy.html
index 2094f49,3f979df..11c662e
--- a/doc/refManual/hierarchy.html
+++ b/doc/refManual/hierarchy.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -112,9 -113,9 +117,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/index.filtered.qhp
index 19ff894,2735a24..d87980f
--- a/doc/refManual/index.filtered.qhp
+++ b/doc/refManual/index.filtered.qhp
@@@ -1,11 -1,11 +1,19 @@@
<?xml version="1.0" encoding="UTF-8"?>
<QtHelpProject version="1.0">
++<<<<<<< HEAD
+ <namespace>com.libqglviewer.2.6.1</namespace>
++=======
+ <namespace>com.libqglviewer.2.6.3</namespace>
++>>>>>>> upstream/2.6.3+dfsg1
<virtualFolder>doc</virtualFolder>
<filterSection>
<filterAttribute>doxygen</filterAttribute>
<toc>
++<<<<<<< HEAD
+ <section title="libQGLViewer Version 2.6.1" ref="index.html">
++=======
+ <section title="libQGLViewer Version 2.6.3" ref="index.html">
++>>>>>>> upstream/2.6.3+dfsg1
<section title="Namespaces">
<section title="Namespace List" ref="namespaces.html">
<section title="qglviewer" ref="namespaceqglviewer.html" />
diff --cc doc/refManual/index.html
index 14d4e55,7a9d1a6..54dd7ab
--- a/doc/refManual/index.html
+++ b/doc/refManual/index.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -88,9 -89,9 +93,13 @@@ var searchBox = new SearchBox("searchBo
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/index.qhp
index 19ff894,2735a24..d87980f
--- a/doc/refManual/index.qhp
+++ b/doc/refManual/index.qhp
@@@ -1,11 -1,11 +1,19 @@@
<?xml version="1.0" encoding="UTF-8"?>
<QtHelpProject version="1.0">
++<<<<<<< HEAD
+ <namespace>com.libqglviewer.2.6.1</namespace>
++=======
+ <namespace>com.libqglviewer.2.6.3</namespace>
++>>>>>>> upstream/2.6.3+dfsg1
<virtualFolder>doc</virtualFolder>
<filterSection>
<filterAttribute>doxygen</filterAttribute>
<toc>
++<<<<<<< HEAD
+ <section title="libQGLViewer Version 2.6.1" ref="index.html">
++=======
+ <section title="libQGLViewer Version 2.6.3" ref="index.html">
++>>>>>>> upstream/2.6.3+dfsg1
<section title="Namespaces">
<section title="Namespace List" ref="namespaces.html">
<section title="qglviewer" ref="namespaceqglviewer.html" />
diff --cc doc/refManual/keyFrameInterpolator_8cpp.html
index 5258501,aec8c03..8c5a573
--- a/doc/refManual/keyFrameInterpolator_8cpp.html
+++ b/doc/refManual/keyFrameInterpolator_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/keyFrameInterpolator_8h.html
index f50d558,457ae5f..1ea6558
--- a/doc/refManual/keyFrameInterpolator_8h.html
+++ b/doc/refManual/keyFrameInterpolator_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -109,9 -110,9 +114,13 @@@ Namespaces</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/manipulatedCameraFrame_8cpp.html
index bc8c0ae,4e852ef..9902163
--- a/doc/refManual/manipulatedCameraFrame_8cpp.html
+++ b/doc/refManual/manipulatedCameraFrame_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/manipulatedCameraFrame_8h.html
index d9935c0,10b3c54..e2c2c9d
--- a/doc/refManual/manipulatedCameraFrame_8h.html
+++ b/doc/refManual/manipulatedCameraFrame_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -109,9 -110,9 +114,13 @@@ Namespaces</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/manipulatedFrame_8cpp.html
index 6bf7a0f,fbf61a6..9d7eaca
--- a/doc/refManual/manipulatedFrame_8cpp.html
+++ b/doc/refManual/manipulatedFrame_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/manipulatedFrame_8h.html
index 476a926,5fa748d..db3007b
--- a/doc/refManual/manipulatedFrame_8h.html
+++ b/doc/refManual/manipulatedFrame_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -109,9 -110,9 +114,13 @@@ Namespaces</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/mouseGrabber_8cpp.html
index 9d93d10,3fabb4c..2ed7fbd
--- a/doc/refManual/mouseGrabber_8cpp.html
+++ b/doc/refManual/mouseGrabber_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/mouseGrabber_8h.html
index cc5a400,b94edc1..98b2fa5
--- a/doc/refManual/mouseGrabber_8h.html
+++ b/doc/refManual/mouseGrabber_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -109,9 -110,9 +114,13 @@@ Namespaces</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/namespaceqglviewer.html
index 166586b,a220b4b..6ea324f
--- a/doc/refManual/namespaceqglviewer.html
+++ b/doc/refManual/namespaceqglviewer.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -134,9 -135,9 +139,13 @@@ Classes</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/namespaces.html
index 7b37a4c,a7297c9..e31d9a8
--- a/doc/refManual/namespaces.html
+++ b/doc/refManual/namespaces.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:04 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/qglviewer_8cpp.html
index e9f8ca1,92eed30..2982b61
--- a/doc/refManual/qglviewer_8cpp.html
+++ b/doc/refManual/qglviewer_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -94,9 -95,9 +99,13 @@@ var searchBox = new SearchBox("searchBo
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/qglviewer_8h.html
index e28fcad,fe2fe4a..3a3f51e
--- a/doc/refManual/qglviewer_8h.html
+++ b/doc/refManual/qglviewer_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -109,9 -110,9 +114,13 @@@ Namespaces</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/quaternion_8cpp.html
index 9252930,51217fb..fe52e9d
--- a/doc/refManual/quaternion_8cpp.html
+++ b/doc/refManual/quaternion_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -129,9 -130,9 +134,13 @@@ Functions</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/quaternion_8h.html
index 44d9b57,eaa512e..824e183
--- a/doc/refManual/quaternion_8h.html
+++ b/doc/refManual/quaternion_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -142,9 -143,9 +147,13 @@@ Functions</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/saveSnapshot_8cpp.html
index e9ad784,b715c05..3734929
--- a/doc/refManual/saveSnapshot_8cpp.html
+++ b/doc/refManual/saveSnapshot_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -119,9 -120,9 +124,13 @@@ Functions</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/vec_8cpp.html
index a18cad2,ee4cc39..2dd7023
--- a/doc/refManual/vec_8cpp.html
+++ b/doc/refManual/vec_8cpp.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -129,9 -130,9 +134,13 @@@ Functions</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/refManual/vec_8h.html
index 01d6f0b,80e4cdd..81af914
--- a/doc/refManual/vec_8h.html
+++ b/doc/refManual/vec_8h.html
@@@ -25,7 -26,7 +26,11 @@@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">libQGLViewer
++<<<<<<< HEAD
+ <span id="projectnumber">Version 2.6.1</span>
++=======
+ <span id="projectnumber">Version 2.6.3</span>
++>>>>>>> upstream/2.6.3+dfsg1
</div>
</td>
</tr>
@@@ -142,9 -143,9 +147,13 @@@ Functions</h2></td></tr
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
++<<<<<<< HEAD
+Generated on Thu Jan 22 2015 16:15:38 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++=======
+ Generated on Wed Jun 24 2015 23:34:03 for libQGLViewer by <a href="http://www.doxygen.org/index.html">
++>>>>>>> upstream/2.6.3+dfsg1
doxygen
- </a> 1.8.8
+ </a> 1.8.9.1
</small></address>
</body>
</html>
diff --cc doc/techFaq.html
index 1ed2e16,30f8ae0..c2b65f6
--- a/doc/techFaq.html
+++ b/doc/techFaq.html
@@@ -224,7 -224,7 +224,11 @@@ and will be added to this page. See als
<p>
<a href="http://validator.w3.org/check/referer"><img src="images/xhtml.png" alt="Valid XHTML 1.0!" height="31" width="88"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="images/css.gif" alt="Valid CSS!" width="88" height="31"/></a>
++<<<<<<< HEAD
+ <i>Last modified on Thursday, January 22, 2015.</i>
++=======
+ <i>Last modified on Wednesday, June 24, 2015.</i>
++>>>>>>> upstream/2.6.3+dfsg1
</p>
</body></html>
diff --cc examples/animation/animation.cpp
index a1ba6a9,0a50cfb..15e27f9
--- a/examples/animation/animation.cpp
+++ b/examples/animation/animation.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/animation/animation.h
index ac225be,4c28221..f43e754
--- a/examples/animation/animation.h
+++ b/examples/animation/animation.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/animation/animation.pro
index 1977346,6e95950..95b2c0d
--- a/examples/animation/animation.pro
+++ b/examples/animation/animation.pro
@@@ -13,301 -13,4 +13,305 @@@ TARGET = animatio
HEADERS = animation.h
SOURCES = animation.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/animation/main.cpp
index 1a9b972,96631bf..0c88ac2
--- a/examples/animation/main.cpp
+++ b/examples/animation/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/callback/callback.cpp
index b2f34f1,62f310a..2abf6a9
--- a/examples/callback/callback.cpp
+++ b/examples/callback/callback.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/callback/callback.h
index 7c43796,e15be8b..4e935d1
--- a/examples/callback/callback.h
+++ b/examples/callback/callback.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/callback/callback.pro
index 293ff3a,e09f8c6..973c80d
--- a/examples/callback/callback.pro
+++ b/examples/callback/callback.pro
@@@ -10,301 -10,4 +10,305 @@@ TARGET = callbac
HEADERS = callback.h
SOURCES = callback.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/callback/main.cpp
index f846d7a,f71f386..a80947b
--- a/examples/callback/main.cpp
+++ b/examples/callback/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/cameraLight/cameraLight.cpp
index c99b82d,6e77a70..ef46496
--- a/examples/cameraLight/cameraLight.cpp
+++ b/examples/cameraLight/cameraLight.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/cameraLight/cameraLight.h
index 374ed36,0f69f35..7c33aac
--- a/examples/cameraLight/cameraLight.h
+++ b/examples/cameraLight/cameraLight.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/cameraLight/cameraLight.pro
index 265ff54,4cb507e..1681e17
--- a/examples/cameraLight/cameraLight.pro
+++ b/examples/cameraLight/cameraLight.pro
@@@ -12,301 -12,4 +12,305 @@@ TARGET = cameraLigh
HEADERS = cameraLight.h
SOURCES = cameraLight.cpp main.cpp
-include( ../examples.pri )
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/cameraLight/main.cpp
index 637da24,0c453f3..6d7bbac
--- a/examples/cameraLight/main.cpp
+++ b/examples/cameraLight/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/clippingPlane/clippingPlane.cpp
index b1d9cc0,54d363f..17e7f17
--- a/examples/clippingPlane/clippingPlane.cpp
+++ b/examples/clippingPlane/clippingPlane.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/clippingPlane/clippingPlane.h
index 09f3405,5f149fe..08eedee
--- a/examples/clippingPlane/clippingPlane.h
+++ b/examples/clippingPlane/clippingPlane.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/clippingPlane/clippingPlane.pro
index 6b409fb,3e33bbd..b131f7d
--- a/examples/clippingPlane/clippingPlane.pro
+++ b/examples/clippingPlane/clippingPlane.pro
@@@ -15,301 -15,4 +15,305 @@@ TARGET = clippingPlan
HEADERS = clippingPlane.h
SOURCES = clippingPlane.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/clippingPlane/main.cpp
index b1eeac7,b2cf55d..fa19ae6
--- a/examples/clippingPlane/main.cpp
+++ b/examples/clippingPlane/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/constrainedCamera/constrainedCamera.cpp
index 3d23d0e,cdbbe11..f0fc559
--- a/examples/constrainedCamera/constrainedCamera.cpp
+++ b/examples/constrainedCamera/constrainedCamera.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/constrainedCamera/constrainedCamera.h
index 82b8cee,b431c9f..ff9689d
--- a/examples/constrainedCamera/constrainedCamera.h
+++ b/examples/constrainedCamera/constrainedCamera.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/constrainedCamera/constrainedCamera.pro
index e90bef1,32db72b..329aa11
--- a/examples/constrainedCamera/constrainedCamera.pro
+++ b/examples/constrainedCamera/constrainedCamera.pro
@@@ -12,301 -12,4 +12,305 @@@ TARGET = constrainedCamer
HEADERS = constrainedCamera.h
SOURCES = constrainedCamera.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/constrainedCamera/main.cpp
index b5705e3,b611bda..a88c76e
--- a/examples/constrainedCamera/main.cpp
+++ b/examples/constrainedCamera/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/constrainedFrame/constrainedFrame.cpp
index 1a0523e,ac5a249..e9133c5
--- a/examples/constrainedFrame/constrainedFrame.cpp
+++ b/examples/constrainedFrame/constrainedFrame.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/constrainedFrame/constrainedFrame.h
index 3ccd420,deed91a..1f15f24
--- a/examples/constrainedFrame/constrainedFrame.h
+++ b/examples/constrainedFrame/constrainedFrame.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/constrainedFrame/constrainedFrame.pro
index 06bd9c4,f06b58e..d1e6b77
--- a/examples/constrainedFrame/constrainedFrame.pro
+++ b/examples/constrainedFrame/constrainedFrame.pro
@@@ -12,301 -12,4 +12,305 @@@ TARGET = constrainedFram
HEADERS = constrainedFrame.h
SOURCES = constrainedFrame.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/constrainedFrame/main.cpp
index 47e49bb,bc7b323..32cd338
--- a/examples/constrainedFrame/main.cpp
+++ b/examples/constrainedFrame/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/3dsViewer/3dsViewer.cpp
index 8d7cb0e,2cb0d3f..c94eb80
--- a/examples/contribs/3dsViewer/3dsViewer.cpp
+++ b/examples/contribs/3dsViewer/3dsViewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/3dsViewer/3dsViewer.h
index ace1abc,9b07053..9b6fed6
--- a/examples/contribs/3dsViewer/3dsViewer.h
+++ b/examples/contribs/3dsViewer/3dsViewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/3dsViewer/3dsViewer.pro
index 9d1ba17,b152710..4d9895f
--- a/examples/contribs/3dsViewer/3dsViewer.pro
+++ b/examples/contribs/3dsViewer/3dsViewer.pro
@@@ -41,301 -41,4 +41,305 @@@ SOURCES = 3dsViewer.cpp main.cp
DISTFILES += *.3DS
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/3dsViewer/main.cpp
index 051f674,54283ac..9de44cd
--- a/examples/contribs/3dsViewer/main.cpp
+++ b/examples/contribs/3dsViewer/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/AI/AI.pro
index 6ef79dc,acde4ca..079970a
--- a/examples/contribs/agora/AI/AI.pro
+++ b/examples/contribs/agora/AI/AI.pro
@@@ -4,301 -4,4 +4,305 @@@ TARGET = agoraA
HEADERS = ../Viewer/board.h ../Viewer/move.h ../Viewer/undo.h ../Viewer/case.h
SOURCES = ai.cpp ../Viewer/board.cpp ../Viewer/move.cpp ../Viewer/undo.cpp ../Viewer/case.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../../qglviewer.rc ) {
+ RC_FILE = ../../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../../../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/agora/AI/ai.cpp
index f1f209d,97f63f2..e4902c1
--- a/examples/contribs/agora/AI/ai.cpp
+++ b/examples/contribs/agora/AI/ai.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/Viewer.pro
index d90142c,ad1240e..c3a413c
--- a/examples/contribs/agora/Viewer/Viewer.pro
+++ b/examples/contribs/agora/Viewer/Viewer.pro
@@@ -18,302 -18,5 +18,306 @@@ contains( QT_VERSION, "^3.*" )
DISTFILES *= ../AgoraBoards/*.ago
+ include( ../../../examples.pri )
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../../qglviewer.rc ) {
+ RC_FILE = ../../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/agora/Viewer/agoraViewer.cpp
index 4d04a04,afbd63c..4b4a2c4
--- a/examples/contribs/agora/Viewer/agoraViewer.cpp
+++ b/examples/contribs/agora/Viewer/agoraViewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/agoraViewer.h
index 31cae7c,3e5ea28..ad9a5bc
--- a/examples/contribs/agora/Viewer/agoraViewer.h
+++ b/examples/contribs/agora/Viewer/agoraViewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/board.cpp
index 3c6659c,4527c44..80c7277
--- a/examples/contribs/agora/Viewer/board.cpp
+++ b/examples/contribs/agora/Viewer/board.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/board.h
index bf83637,e987557..3ce0919
--- a/examples/contribs/agora/Viewer/board.h
+++ b/examples/contribs/agora/Viewer/board.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/case.cpp
index 069a9c2,2b7bd01..d954dbf
--- a/examples/contribs/agora/Viewer/case.cpp
+++ b/examples/contribs/agora/Viewer/case.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/case.h
index f830887,2cf43ab..c8fa6b7
--- a/examples/contribs/agora/Viewer/case.h
+++ b/examples/contribs/agora/Viewer/case.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/computerPlayer.cpp
index 6f8b2f0,85ccc0e..b9e687c
--- a/examples/contribs/agora/Viewer/computerPlayer.cpp
+++ b/examples/contribs/agora/Viewer/computerPlayer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/computerPlayer.h
index 362032a,37e82fe..7da76aa
--- a/examples/contribs/agora/Viewer/computerPlayer.h
+++ b/examples/contribs/agora/Viewer/computerPlayer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/main.cpp
index e68355e,fd213b2..447278b
--- a/examples/contribs/agora/Viewer/main.cpp
+++ b/examples/contribs/agora/Viewer/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/move.cpp
index c9717fb,a908df6..ffb7ab7
--- a/examples/contribs/agora/Viewer/move.cpp
+++ b/examples/contribs/agora/Viewer/move.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/move.h
index 8f8ca02,ccc3341..23878a4
--- a/examples/contribs/agora/Viewer/move.h
+++ b/examples/contribs/agora/Viewer/move.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/undo.cpp
index 43a01bc,4fbe82f..3153708
--- a/examples/contribs/agora/Viewer/undo.cpp
+++ b/examples/contribs/agora/Viewer/undo.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/agora/Viewer/undo.h
index 3925a44,49451dc..065849a
--- a/examples/contribs/agora/Viewer/undo.h
+++ b/examples/contribs/agora/Viewer/undo.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/anaglyph/anaglyph.cpp
index e0be8d8,21c9a09..cbe58bc
--- a/examples/contribs/anaglyph/anaglyph.cpp
+++ b/examples/contribs/anaglyph/anaglyph.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/anaglyph/anaglyph.h
index e55b86e,062c701..5dd5ff9
--- a/examples/contribs/anaglyph/anaglyph.h
+++ b/examples/contribs/anaglyph/anaglyph.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/anaglyph/anaglyph.pro
index 2b3c426,265feb0..d9fdeb5
--- a/examples/contribs/anaglyph/anaglyph.pro
+++ b/examples/contribs/anaglyph/anaglyph.pro
@@@ -14,302 -14,5 +14,306 @@@ TARGET = anaglyp
HEADERS = anaglyph.h
SOURCES = anaglyph.cpp main.cpp
+ include( ../../examples.pri )
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/anaglyph/main.cpp
index dc4c441,0176657..9046d92
--- a/examples/contribs/anaglyph/main.cpp
+++ b/examples/contribs/anaglyph/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/backgroundImage/backgroundImage.cpp
index b9c5f86,d5ba266..4f0760d
--- a/examples/contribs/backgroundImage/backgroundImage.cpp
+++ b/examples/contribs/backgroundImage/backgroundImage.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/backgroundImage/backgroundImage.h
index cf934d9,a10aaf1..cf73175
--- a/examples/contribs/backgroundImage/backgroundImage.h
+++ b/examples/contribs/backgroundImage/backgroundImage.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/backgroundImage/backgroundImage.pro
index f5b9b82,4cd32f3..29e753c
--- a/examples/contribs/backgroundImage/backgroundImage.pro
+++ b/examples/contribs/backgroundImage/backgroundImage.pro
@@@ -16,301 -16,4 +16,305 @@@ SOURCES = backgroundImage.cpp main.cp
DISTFILES += *.png
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/backgroundImage/main.cpp
index 38f2678,bfec5b6..0932d7b
--- a/examples/contribs/backgroundImage/main.cpp
+++ b/examples/contribs/backgroundImage/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/AI/AI.pro
index 57d66be,756119b..55b193e
--- a/examples/contribs/blobWar/AI/AI.pro
+++ b/examples/contribs/blobWar/AI/AI.pro
@@@ -4,301 -4,4 +4,305 @@@ TARGET = blobWarA
HEADERS = ../Viewer/board.h ../Viewer/move.h ../Viewer/undo.h
SOURCES = ai.cpp ../Viewer/board.cpp ../Viewer/move.cpp ../Viewer/undo.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../../qglviewer.rc ) {
+ RC_FILE = ../../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../../../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/blobWar/AI/ai.cpp
index b98eae1,f4cc810..4797626
--- a/examples/contribs/blobWar/AI/ai.cpp
+++ b/examples/contribs/blobWar/AI/ai.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/Viewer.pro
index 8b4186f,83402b5..28e19f4
--- a/examples/contribs/blobWar/Viewer/Viewer.pro
+++ b/examples/contribs/blobWar/Viewer/Viewer.pro
@@@ -24,302 -24,10 +24,312 @@@ contains( QT_VERSION, "^3.*" )
DISTFILES *= ../BlobWarBoards/*.bwb
++<<<<<<< HEAD
+
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
++=======
+ # Since we use gluCylinder
+ !macx|darwin-g++ {
+ QMAKE_LIBS_OPENGL *= -lGLU
++>>>>>>> upstream/2.6.3+dfsg1
}
+ include( ../../../examples.pri )
++<<<<<<< HEAD
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../../qglviewer.rc ) {
+ RC_FILE = ../../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/blobWar/Viewer/blobWarViewer.cpp
index 9bee840,89facb2..0835ac0
--- a/examples/contribs/blobWar/Viewer/blobWarViewer.cpp
+++ b/examples/contribs/blobWar/Viewer/blobWarViewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/blobWarViewer.h
index fff2680,1b640b4..3679f8d
--- a/examples/contribs/blobWar/Viewer/blobWarViewer.h
+++ b/examples/contribs/blobWar/Viewer/blobWarViewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/board.cpp
index c927bec,f1a5efd..338f34e
--- a/examples/contribs/blobWar/Viewer/board.cpp
+++ b/examples/contribs/blobWar/Viewer/board.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/board.h
index 82c97c6,4b1e250..eb088c9
--- a/examples/contribs/blobWar/Viewer/board.h
+++ b/examples/contribs/blobWar/Viewer/board.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/boardDraw.cpp
index ac674fd,0e7d00b..a2838b8
--- a/examples/contribs/blobWar/Viewer/boardDraw.cpp
+++ b/examples/contribs/blobWar/Viewer/boardDraw.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/computerPlayer.cpp
index edbf88c,1c776af..c873858
--- a/examples/contribs/blobWar/Viewer/computerPlayer.cpp
+++ b/examples/contribs/blobWar/Viewer/computerPlayer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/computerPlayer.h
index a313e54,08a5862..d5677f4
--- a/examples/contribs/blobWar/Viewer/computerPlayer.h
+++ b/examples/contribs/blobWar/Viewer/computerPlayer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/main.cpp
index 4c301a3,d4b0da2..a9bf23f
--- a/examples/contribs/blobWar/Viewer/main.cpp
+++ b/examples/contribs/blobWar/Viewer/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/move.cpp
index 6414409,deb87bc..9dfb100
--- a/examples/contribs/blobWar/Viewer/move.cpp
+++ b/examples/contribs/blobWar/Viewer/move.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/move.h
index 5c03a69,7bda78b..ee7d971
--- a/examples/contribs/blobWar/Viewer/move.h
+++ b/examples/contribs/blobWar/Viewer/move.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/undo.cpp
index 43a01bc,4fbe82f..3153708
--- a/examples/contribs/blobWar/Viewer/undo.cpp
+++ b/examples/contribs/blobWar/Viewer/undo.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/blobWar/Viewer/undo.h
index 3925a44,49451dc..065849a
--- a/examples/contribs/blobWar/Viewer/undo.h
+++ b/examples/contribs/blobWar/Viewer/undo.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/cornerAxis/cornerAxis.cpp
index 22c8321,de88385..0027c9c
--- a/examples/contribs/cornerAxis/cornerAxis.cpp
+++ b/examples/contribs/cornerAxis/cornerAxis.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/cornerAxis/cornerAxis.h
index 81d55e0,e72188f..0eb1f1b
--- a/examples/contribs/cornerAxis/cornerAxis.h
+++ b/examples/contribs/cornerAxis/cornerAxis.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/cornerAxis/cornerAxis.pro
index 13eb99d,61860d2..038c6df
--- a/examples/contribs/cornerAxis/cornerAxis.pro
+++ b/examples/contribs/cornerAxis/cornerAxis.pro
@@@ -13,302 -13,5 +13,306 @@@ TARGET = cornerAxi
HEADERS = cornerAxis.h
SOURCES = cornerAxis.cpp main.cpp
+ include( ../../examples.pri )
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/cornerAxis/main.cpp
index 2a802be,0e660eb..d601bac
--- a/examples/contribs/cornerAxis/main.cpp
+++ b/examples/contribs/cornerAxis/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/board.cpp
index e942225,867c342..5e1315e
--- a/examples/contribs/dvonn/board.cpp
+++ b/examples/contribs/dvonn/board.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/board.h
index c6ec414,e64cacc..29ab6e6
--- a/examples/contribs/dvonn/board.h
+++ b/examples/contribs/dvonn/board.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/drawer.cpp
index 2700654,beab917..ee9334a
--- a/examples/contribs/dvonn/drawer.cpp
+++ b/examples/contribs/dvonn/drawer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/drawer.h
index f8b7a5b,c452963..d9ff9a6
--- a/examples/contribs/dvonn/drawer.h
+++ b/examples/contribs/dvonn/drawer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/dvonn.pro
index 29765d9,d0ffb18..5c06581
--- a/examples/contribs/dvonn/dvonn.pro
+++ b/examples/contribs/dvonn/dvonn.pro
@@@ -23,302 -23,10 +23,312 @@@ contains( QT_VERSION, "^3.*" )
FORMS += dvonnwindow.ui
}
++<<<<<<< HEAD
+
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
++=======
+ # Since we use gluBuild2DMipmaps
+ !macx|darwin-g++ {
+ QMAKE_LIBS_OPENGL *= -lGLU
++>>>>>>> upstream/2.6.3+dfsg1
}
+ include( ../../examples.pri )
++<<<<<<< HEAD
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/dvonn/dvonnviewer.cpp
index 61943dc,68f9a0f..52c6327
--- a/examples/contribs/dvonn/dvonnviewer.cpp
+++ b/examples/contribs/dvonn/dvonnviewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/dvonnviewer.h
index 42512cb,2b52e1f..7771d83
--- a/examples/contribs/dvonn/dvonnviewer.h
+++ b/examples/contribs/dvonn/dvonnviewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/dvonnwindowimpl.cpp
index b2e9b19,c3ecfd8..3d8853b
--- a/examples/contribs/dvonn/dvonnwindowimpl.cpp
+++ b/examples/contribs/dvonn/dvonnwindowimpl.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/dvonnwindowimpl.h
index 98c59a4,9d28298..4b8402f
--- a/examples/contribs/dvonn/dvonnwindowimpl.h
+++ b/examples/contribs/dvonn/dvonnwindowimpl.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/game.cpp
index 71d51c8,880047f..365475a
--- a/examples/contribs/dvonn/game.cpp
+++ b/examples/contribs/dvonn/game.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/game.h
index 7555766,50452f0..db02873
--- a/examples/contribs/dvonn/game.h
+++ b/examples/contribs/dvonn/game.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/dvonn/main.cpp
index f5eff57,edc3fe3..8613f6a
--- a/examples/contribs/dvonn/main.cpp
+++ b/examples/contribs/dvonn/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/eventRecorder/eventRecorder.cpp
index c83474c,e4de542..603b25f
--- a/examples/contribs/eventRecorder/eventRecorder.cpp
+++ b/examples/contribs/eventRecorder/eventRecorder.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/eventRecorder/eventRecorder.h
index fb4f615,6960e79..b1c26fd
--- a/examples/contribs/eventRecorder/eventRecorder.h
+++ b/examples/contribs/eventRecorder/eventRecorder.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/eventRecorder/eventRecorder.pro
index 36cb029,fedd423..b1725ad
--- a/examples/contribs/eventRecorder/eventRecorder.pro
+++ b/examples/contribs/eventRecorder/eventRecorder.pro
@@@ -20,302 -20,5 +20,306 @@@ QT_VERSION=$$[QT_VERSION
warning(This example has only been validated with Qt3)
}
+ include( ../../examples.pri )
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/eventRecorder/main.cpp
index a3366d2,79e91dc..585d2a6
--- a/examples/contribs/eventRecorder/main.cpp
+++ b/examples/contribs/eventRecorder/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/eventRecorder/viewer.cpp
index 5cc2455,b337ceb..2220fd5
--- a/examples/contribs/eventRecorder/viewer.cpp
+++ b/examples/contribs/eventRecorder/viewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/eventRecorder/viewer.h
index a961a16,f88ba4d..e96c6ea
--- a/examples/contribs/eventRecorder/viewer.h
+++ b/examples/contribs/eventRecorder/viewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/glview.cpp
index 112e066,6e612a7..4a1a254
--- a/examples/contribs/quarto/glview.cpp
+++ b/examples/contribs/quarto/glview.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/glview.h
index 256f92d,73414be..6c31330
--- a/examples/contribs/quarto/glview.h
+++ b/examples/contribs/quarto/glview.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/jeu.cpp
index e9eee92,085d80a..d47d6ce
--- a/examples/contribs/quarto/jeu.cpp
+++ b/examples/contribs/quarto/jeu.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/jeu.h
index 4414b32,c7e5bc0..53ff760
--- a/examples/contribs/quarto/jeu.h
+++ b/examples/contribs/quarto/jeu.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/main.cpp
index a811c45,83a478e..1c90e58
--- a/examples/contribs/quarto/main.cpp
+++ b/examples/contribs/quarto/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/piece.cpp
index 6ec8311,790ae08..6eee386
--- a/examples/contribs/quarto/piece.cpp
+++ b/examples/contribs/quarto/piece.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/piece.h
index 96c19a0,d4ec91d..81a7912
--- a/examples/contribs/quarto/piece.h
+++ b/examples/contribs/quarto/piece.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/quarto.cpp
index 3456ce5,89442e2..fb756de
--- a/examples/contribs/quarto/quarto.cpp
+++ b/examples/contribs/quarto/quarto.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/quarto.h
index b4cc561,ef367c3..201f330
--- a/examples/contribs/quarto/quarto.h
+++ b/examples/contribs/quarto/quarto.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/quarto/quarto.pro
index 7ba45dd,87473a3..8163f1c
--- a/examples/contribs/quarto/quarto.pro
+++ b/examples/contribs/quarto/quarto.pro
@@@ -17,302 -17,5 +17,306 @@@ QT_VERSION=$$[QT_VERSION
warning(This example has not been validated after Qt3)
}
+ include( ../../examples.pri )
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/terrain/main.cpp
index 578e3ec,c9f4d6a..0b053e4
--- a/examples/contribs/terrain/main.cpp
+++ b/examples/contribs/terrain/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/quadtree.cpp
index 2ee3e73,95a1db5..fab33e3
--- a/examples/contribs/terrain/quadtree.cpp
+++ b/examples/contribs/terrain/quadtree.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/quadtree.h
index 30e520a,33f852d..82c9ea5
--- a/examples/contribs/terrain/quadtree.h
+++ b/examples/contribs/terrain/quadtree.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/sky.cpp
index 3f18bc1,e0651d1..5f46bb7
--- a/examples/contribs/terrain/sky.cpp
+++ b/examples/contribs/terrain/sky.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/sky.h
index bf17e88,bea7ed1..2b6fc7f
--- a/examples/contribs/terrain/sky.h
+++ b/examples/contribs/terrain/sky.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/terrain.cpp
index 664362c,fae7f38..3f5c733
--- a/examples/contribs/terrain/terrain.cpp
+++ b/examples/contribs/terrain/terrain.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/terrain.h
index de913fc,8d4a43c..2d697a1
--- a/examples/contribs/terrain/terrain.h
+++ b/examples/contribs/terrain/terrain.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/terrain.pro
index 6ec8f8d,6d23de5..4506c49
--- a/examples/contribs/terrain/terrain.pro
+++ b/examples/contribs/terrain/terrain.pro
@@@ -14,301 -14,4 +14,305 @@@ SOURCES = quadtree.cpp terrain.cpp vie
DISTFILES *= height128.raw Data/*.jpg Data/*.png
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/terrain/tree.cpp
index 63b5e76,f44b128..c6c1b4f
--- a/examples/contribs/terrain/tree.cpp
+++ b/examples/contribs/terrain/tree.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/tree.h
index 7aced22,22fd086..9d40c10
--- a/examples/contribs/terrain/tree.h
+++ b/examples/contribs/terrain/tree.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/viewer.cpp
index bf5da32,b00d9d8..090aa4a
--- a/examples/contribs/terrain/viewer.cpp
+++ b/examples/contribs/terrain/viewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/viewer.h
index 447f7fc,634e6f2..17af336
--- a/examples/contribs/terrain/viewer.h
+++ b/examples/contribs/terrain/viewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/water.cpp
index a877ea9,1b00fb0..7433a12
--- a/examples/contribs/terrain/water.cpp
+++ b/examples/contribs/terrain/water.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/terrain/water.h
index 20de2db,395edb7..950c3ea
--- a/examples/contribs/terrain/water.h
+++ b/examples/contribs/terrain/water.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/textureViewer/main.cpp
index dd56322,f15c036..ac2daaf
--- a/examples/contribs/textureViewer/main.cpp
+++ b/examples/contribs/textureViewer/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/textureViewer/textureViewer.cpp
index efcfb21,f3357f3..6402eb2
--- a/examples/contribs/textureViewer/textureViewer.cpp
+++ b/examples/contribs/textureViewer/textureViewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/textureViewer/textureViewer.h
index c799965,f9ff8ee..592db4b
--- a/examples/contribs/textureViewer/textureViewer.h
+++ b/examples/contribs/textureViewer/textureViewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/textureViewer/textureViewer.pro
index f50f74a,4f8dc62..b471ccb
--- a/examples/contribs/textureViewer/textureViewer.pro
+++ b/examples/contribs/textureViewer/textureViewer.pro
@@@ -16,301 -16,4 +16,305 @@@ SOURCES = textureViewer.cpp main.cp
DISTFILES += *.png
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/contribs/thumbnail/main.cpp
index cc0f121,077f33d..72e2001
--- a/examples/contribs/thumbnail/main.cpp
+++ b/examples/contribs/thumbnail/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/thumbnail/thumbnail.cpp
index c175ae8,c48310d..3f4628a
--- a/examples/contribs/thumbnail/thumbnail.cpp
+++ b/examples/contribs/thumbnail/thumbnail.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/thumbnail/thumbnail.h
index 5dfc296,673bcb3..cd87c74
--- a/examples/contribs/thumbnail/thumbnail.h
+++ b/examples/contribs/thumbnail/thumbnail.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/contribs/thumbnail/thumbnail.pro
index 8fd7db6,33e3295..263da58
--- a/examples/contribs/thumbnail/thumbnail.pro
+++ b/examples/contribs/thumbnail/thumbnail.pro
@@@ -14,302 -14,5 +14,306 @@@ CONFIG += qt opengl warn_on release th
HEADERS = thumbnail.h
SOURCES = thumbnail.cpp main.cpp
+ include( ../../examples.pri )
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../../qglviewer.rc ) {
+ RC_FILE = ../../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/drawLight/drawLight.cpp
index f7af4f6,6a98db4..5f3d506
--- a/examples/drawLight/drawLight.cpp
+++ b/examples/drawLight/drawLight.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/drawLight/drawLight.h
index 0456d60,b86f1d2..d1f6ddf
--- a/examples/drawLight/drawLight.h
+++ b/examples/drawLight/drawLight.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/drawLight/drawLight.pro
index f2a999b,d310c85..0f0256a
--- a/examples/drawLight/drawLight.pro
+++ b/examples/drawLight/drawLight.pro
@@@ -9,301 -9,4 +9,305 @@@ TARGET = drawLigh
HEADERS = drawLight.h
SOURCES = drawLight.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/drawLight/main.cpp
index 7f6e5c8,2a918f6..3f4ecb7
--- a/examples/drawLight/main.cpp
+++ b/examples/drawLight/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/fastDraw/fastDraw.cpp
index 633cd81,974f67c..e416099
--- a/examples/fastDraw/fastDraw.cpp
+++ b/examples/fastDraw/fastDraw.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/fastDraw/fastDraw.h
index a41b6c3,4679e53..e0701e6
--- a/examples/fastDraw/fastDraw.h
+++ b/examples/fastDraw/fastDraw.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/fastDraw/fastDraw.pro
index c896298,93a78d8..5e7962c
--- a/examples/fastDraw/fastDraw.pro
+++ b/examples/fastDraw/fastDraw.pro
@@@ -11,301 -11,4 +11,305 @@@ TARGET = fastDra
HEADERS = fastDraw.h
SOURCES = fastDraw.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/fastDraw/main.cpp
index e4b81d6,edb189b..7cba534
--- a/examples/fastDraw/main.cpp
+++ b/examples/fastDraw/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frameTransform/frameTransform.cpp
index c5224c1,9e7fd07..cb8113c
--- a/examples/frameTransform/frameTransform.cpp
+++ b/examples/frameTransform/frameTransform.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frameTransform/frameTransform.h
index 09f3405,5f149fe..08eedee
--- a/examples/frameTransform/frameTransform.h
+++ b/examples/frameTransform/frameTransform.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frameTransform/frameTransform.pro
index 54cea32,73bc166..0b0916e
--- a/examples/frameTransform/frameTransform.pro
+++ b/examples/frameTransform/frameTransform.pro
@@@ -26,301 -26,4 +26,305 @@@ TARGET = frameTransfor
HEADERS = frameTransform.h
SOURCES = frameTransform.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/frameTransform/main.cpp
index b13a7f4,cb7723c..43734d6
--- a/examples/frameTransform/main.cpp
+++ b/examples/frameTransform/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frustumCulling/box.cpp
index a9f6b0d,04219f7..25f17fa
--- a/examples/frustumCulling/box.cpp
+++ b/examples/frustumCulling/box.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frustumCulling/box.h
index bc6ab22,f6008ba..8a24c31
--- a/examples/frustumCulling/box.h
+++ b/examples/frustumCulling/box.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frustumCulling/cullingCamera.cpp
index 9ad2059,28900fa..ffbac45
--- a/examples/frustumCulling/cullingCamera.cpp
+++ b/examples/frustumCulling/cullingCamera.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frustumCulling/cullingCamera.h
index 20c37ab,824febd..b8a1c5b
--- a/examples/frustumCulling/cullingCamera.h
+++ b/examples/frustumCulling/cullingCamera.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frustumCulling/frustumCulling.cpp
index e3b8615,3b4e862..449d5b2
--- a/examples/frustumCulling/frustumCulling.cpp
+++ b/examples/frustumCulling/frustumCulling.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frustumCulling/frustumCulling.h
index 8a26627,3f19e59..2248dae
--- a/examples/frustumCulling/frustumCulling.h
+++ b/examples/frustumCulling/frustumCulling.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/frustumCulling/frustumCulling.pro
index e7cafe6,ad0a583..6893b55
--- a/examples/frustumCulling/frustumCulling.pro
+++ b/examples/frustumCulling/frustumCulling.pro
@@@ -13,301 -13,4 +13,305 @@@ TARGET = frustumCullin
HEADERS = frustumCulling.h cullingCamera.h box.h
SOURCES = frustumCulling.cpp cullingCamera.cpp box.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/frustumCulling/main.cpp
index d9cad24,fc40f3d..e1dd6f9
--- a/examples/frustumCulling/main.cpp
+++ b/examples/frustumCulling/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/interface/interface.cpp
index 9b54a3d,816176c..462dc32
--- a/examples/interface/interface.cpp
+++ b/examples/interface/interface.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/interface/interface.h
index 852b8bf,2d38314..44920c1
--- a/examples/interface/interface.h
+++ b/examples/interface/interface.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/interface/interface.pro
index 74953d9,ccbcf80..d5acb34
--- a/examples/interface/interface.pro
+++ b/examples/interface/interface.pro
@@@ -22,302 -22,5 +22,306 @@@ SOURCES = interface.cpp main.cp
FORMS *= viewerInterface.ui
+ include( ../examples.pri )
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/interface/main.cpp
index d49a679,d324bf6..d1843db
--- a/examples/interface/main.cpp
+++ b/examples/interface/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/keyFrames/keyFrames.cpp
index 6fda582,8df8208..42453bf
--- a/examples/keyFrames/keyFrames.cpp
+++ b/examples/keyFrames/keyFrames.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/keyFrames/keyFrames.h
index 6f4adc5,a28e427..4cb17b6
--- a/examples/keyFrames/keyFrames.h
+++ b/examples/keyFrames/keyFrames.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/keyFrames/keyFrames.pro
index 2132c1f,9534eea..e4a1abc
--- a/examples/keyFrames/keyFrames.pro
+++ b/examples/keyFrames/keyFrames.pro
@@@ -19,301 -19,4 +19,305 @@@ TARGET = keyFrame
HEADERS = keyFrames.h
SOURCES = keyFrames.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/keyFrames/main.cpp
index 36d8317,3465519..7440822
--- a/examples/keyFrames/main.cpp
+++ b/examples/keyFrames/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/keyboardAndMouse/keyboardAndMouse.cpp
index 421c3d2,662eb06..7f1d44a
--- a/examples/keyboardAndMouse/keyboardAndMouse.cpp
+++ b/examples/keyboardAndMouse/keyboardAndMouse.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/keyboardAndMouse/keyboardAndMouse.h
index d06ebe1,fbc555f..644572a
--- a/examples/keyboardAndMouse/keyboardAndMouse.h
+++ b/examples/keyboardAndMouse/keyboardAndMouse.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/keyboardAndMouse/keyboardAndMouse.pro
index 844f831,fb17d5a..53563e4
--- a/examples/keyboardAndMouse/keyboardAndMouse.pro
+++ b/examples/keyboardAndMouse/keyboardAndMouse.pro
@@@ -19,301 -19,4 +19,305 @@@ TARGET = keyboardAndMous
HEADERS = keyboardAndMouse.h
SOURCES = keyboardAndMouse.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/keyboardAndMouse/main.cpp
index 7488d74,acd04ff..442d56d
--- a/examples/keyboardAndMouse/main.cpp
+++ b/examples/keyboardAndMouse/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/luxo/luxo.cpp
index 4717bc9,770de17..8644648
--- a/examples/luxo/luxo.cpp
+++ b/examples/luxo/luxo.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/luxo/luxo.h
index 7e04ef8,256ed96..ae2b81b
--- a/examples/luxo/luxo.h
+++ b/examples/luxo/luxo.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/luxo/luxo.pro
index 4d4ff13,03d4700..1591d66
--- a/examples/luxo/luxo.pro
+++ b/examples/luxo/luxo.pro
@@@ -17,301 -17,9 +17,310 @@@ TARGET = lux
HEADERS = luxo.h
SOURCES = luxo.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ # Since we use gluCylinder
+ !macx|darwin-g++ {
+ QMAKE_LIBS_OPENGL *= -lGLU
+ }
+
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/luxo/main.cpp
index f1615e9,b31f708..85372e9
--- a/examples/luxo/main.cpp
+++ b/examples/luxo/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/manipulatedFrame/main.cpp
index b9d15a8,bd355d5..623d12b
--- a/examples/manipulatedFrame/main.cpp
+++ b/examples/manipulatedFrame/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/manipulatedFrame/manipulatedFrame.cpp
index 3601300,e6341e6..37d4c54
--- a/examples/manipulatedFrame/manipulatedFrame.cpp
+++ b/examples/manipulatedFrame/manipulatedFrame.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/manipulatedFrame/manipulatedFrame.h
index 58aba9b,50d73bc..aa1a436
--- a/examples/manipulatedFrame/manipulatedFrame.h
+++ b/examples/manipulatedFrame/manipulatedFrame.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/manipulatedFrame/manipulatedFrame.pro
index 985222f,c201b17..bad2d5b
--- a/examples/manipulatedFrame/manipulatedFrame.pro
+++ b/examples/manipulatedFrame/manipulatedFrame.pro
@@@ -13,301 -13,4 +13,305 @@@ TARGET = manipulatedFram
HEADERS = manipulatedFrame.h
SOURCES = manipulatedFrame.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/mouseGrabber/main.cpp
index 181ad63,962846b..91e680a
--- a/examples/mouseGrabber/main.cpp
+++ b/examples/mouseGrabber/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/mouseGrabber/mouseGrabber.cpp
index 37c60c9,aed131b..a34f2f5
--- a/examples/mouseGrabber/mouseGrabber.cpp
+++ b/examples/mouseGrabber/mouseGrabber.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/mouseGrabber/mouseGrabber.h
index ad7dde6,ce83f4f..f364941
--- a/examples/mouseGrabber/mouseGrabber.h
+++ b/examples/mouseGrabber/mouseGrabber.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/mouseGrabber/mouseGrabber.pro
index c3c8d15,10e0655..cf18996
--- a/examples/mouseGrabber/mouseGrabber.pro
+++ b/examples/mouseGrabber/mouseGrabber.pro
@@@ -23,301 -23,4 +23,305 @@@ TARGET = mouseGrabbe
HEADERS = mouseGrabber.h
SOURCES = mouseGrabber.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/multiSelect/main.cpp
index d8b8eb5,2001647..ecde42c
--- a/examples/multiSelect/main.cpp
+++ b/examples/multiSelect/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiSelect/manipulatedFrameSetConstraint.cpp
index 13106ac,4a678a3..300e595
--- a/examples/multiSelect/manipulatedFrameSetConstraint.cpp
+++ b/examples/multiSelect/manipulatedFrameSetConstraint.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiSelect/manipulatedFrameSetConstraint.h
index c1b70c5,d34334b..ab7595f
--- a/examples/multiSelect/manipulatedFrameSetConstraint.h
+++ b/examples/multiSelect/manipulatedFrameSetConstraint.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiSelect/multiSelect.cpp
index eb3c838,c1232ed..7d50ab8
--- a/examples/multiSelect/multiSelect.cpp
+++ b/examples/multiSelect/multiSelect.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiSelect/multiSelect.h
index 5eff606,31084d3..6892078
--- a/examples/multiSelect/multiSelect.h
+++ b/examples/multiSelect/multiSelect.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiSelect/multiSelect.pro
index 82c6a20,11fd2b4..9999d20
--- a/examples/multiSelect/multiSelect.pro
+++ b/examples/multiSelect/multiSelect.pro
@@@ -17,301 -17,9 +17,310 @@@ TARGET = multiSelec
HEADERS = multiSelect.h manipulatedFrameSetConstraint.h object.h
SOURCES = multiSelect.cpp manipulatedFrameSetConstraint.cpp object.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ # Since we use gluCylinder
+ !macx|darwin-g++ {
+ QMAKE_LIBS_OPENGL *= -lGLU
+ }
+
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/multiSelect/object.cpp
index b3ba2b3,8e69c72..807805b
--- a/examples/multiSelect/object.cpp
+++ b/examples/multiSelect/object.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiSelect/object.h
index fe2e371,76e2d53..c644478
--- a/examples/multiSelect/object.h
+++ b/examples/multiSelect/object.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiView/main.cpp
index c9246d6,eed16a6..cac09e6
--- a/examples/multiView/main.cpp
+++ b/examples/multiView/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiView/multiView.cpp
index a9c4524,3fd9b35..70e91e7
--- a/examples/multiView/multiView.cpp
+++ b/examples/multiView/multiView.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiView/multiView.h
index 42a3ff0,827e79d..c1f8cd4
--- a/examples/multiView/multiView.h
+++ b/examples/multiView/multiView.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/multiView/multiView.pro
index 4bd4f53,d588287..f5bfe59
--- a/examples/multiView/multiView.pro
+++ b/examples/multiView/multiView.pro
@@@ -12,301 -12,4 +12,305 @@@ TARGET = multiVie
HEADERS = multiView.h
SOURCES = multiView.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/overpainting/main.cpp
index 72732d4,dc5e0a9..93c10df
--- a/examples/overpainting/main.cpp
+++ b/examples/overpainting/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/overpainting/overpainting.pro
index 75e854b,4530042..4a07a21
--- a/examples/overpainting/overpainting.pro
+++ b/examples/overpainting/overpainting.pro
@@@ -11,301 -11,4 +11,305 @@@ TARGET = overpaintin
HEADERS = viewer.h
SOURCES = viewer.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/overpainting/viewer.cpp
index 2b5c66d,b9f2962..4a0da01
--- a/examples/overpainting/viewer.cpp
+++ b/examples/overpainting/viewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/overpainting/viewer.h
index 29f5c18,59d4327..5f4ac13
--- a/examples/overpainting/viewer.h
+++ b/examples/overpainting/viewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/screenCoordSystem/main.cpp
index f75689a,f93d72f..69a90de
--- a/examples/screenCoordSystem/main.cpp
+++ b/examples/screenCoordSystem/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/screenCoordSystem/screenCoordSystem.cpp
index d606338,a6619f0..cd01b03
--- a/examples/screenCoordSystem/screenCoordSystem.cpp
+++ b/examples/screenCoordSystem/screenCoordSystem.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/screenCoordSystem/screenCoordSystem.h
index 368e3b6,50c0eee..7e0ce8b
--- a/examples/screenCoordSystem/screenCoordSystem.h
+++ b/examples/screenCoordSystem/screenCoordSystem.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/screenCoordSystem/screenCoordSystem.pro
index 4086ded,b10dd57..e240e12
--- a/examples/screenCoordSystem/screenCoordSystem.pro
+++ b/examples/screenCoordSystem/screenCoordSystem.pro
@@@ -15,301 -15,9 +15,310 @@@ TARGET = screenCoordSyste
HEADERS = screenCoordSystem.h
SOURCES = screenCoordSystem.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ # Since we use gluCylinder
+ !macx|darwin-g++ {
+ QMAKE_LIBS_OPENGL *= -lGLU
+ }
+
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/select/main.cpp
index da076ab,5c7c579..9ae1d2d
--- a/examples/select/main.cpp
+++ b/examples/select/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/select/select.cpp
index 797b8af,e73d89e..09b2404
--- a/examples/select/select.cpp
+++ b/examples/select/select.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/select/select.h
index 155d611,f885a55..e244c5f
--- a/examples/select/select.h
+++ b/examples/select/select.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/select/select.pro
index da57ec7,884d425..e40f2b0
--- a/examples/select/select.pro
+++ b/examples/select/select.pro
@@@ -14,301 -14,4 +14,305 @@@ TARGET = selec
HEADERS = select.h
SOURCES = select.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/simpleViewer/main.cpp
index ac2f0d4,86ecb52..f961f9f
--- a/examples/simpleViewer/main.cpp
+++ b/examples/simpleViewer/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/simpleViewer/simpleViewer.cpp
index 184f68b,88d081c..2fb12cf
--- a/examples/simpleViewer/simpleViewer.cpp
+++ b/examples/simpleViewer/simpleViewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/simpleViewer/simpleViewer.h
index 09f3405,5f149fe..08eedee
--- a/examples/simpleViewer/simpleViewer.h
+++ b/examples/simpleViewer/simpleViewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/simpleViewer/simpleViewer.pro
index b00ef1b,630fb93..abfd159
--- a/examples/simpleViewer/simpleViewer.pro
+++ b/examples/simpleViewer/simpleViewer.pro
@@@ -14,301 -14,4 +14,305 @@@ TARGET = simpleViewe
HEADERS = simpleViewer.h
SOURCES = simpleViewer.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/standardCamera/cameraViewer.cpp
index 9a1c0b4,76d11ac..13225e8
--- a/examples/standardCamera/cameraViewer.cpp
+++ b/examples/standardCamera/cameraViewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/standardCamera/cameraViewer.h
index 619d5f8,9aa40a2..81bf015
--- a/examples/standardCamera/cameraViewer.h
+++ b/examples/standardCamera/cameraViewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/standardCamera/main.cpp
index 58d4179,4b371f5..b595eff
--- a/examples/standardCamera/main.cpp
+++ b/examples/standardCamera/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/standardCamera/standardCamera.cpp
index 43e8cc2,746ea98..b0546a7
--- a/examples/standardCamera/standardCamera.cpp
+++ b/examples/standardCamera/standardCamera.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/standardCamera/standardCamera.h
index 18b3400,ad6a004..ea20e7a
--- a/examples/standardCamera/standardCamera.h
+++ b/examples/standardCamera/standardCamera.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/standardCamera/standardCamera.pro
index 6b3d7c1,003cdc3..0d41ff7
--- a/examples/standardCamera/standardCamera.pro
+++ b/examples/standardCamera/standardCamera.pro
@@@ -14,301 -14,4 +14,305 @@@ TARGET = standardCamer
HEADERS = viewer.h standardCamera.h cameraViewer.h
SOURCES = viewer.cpp standardCamera.cpp cameraViewer.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
diff --cc examples/standardCamera/viewer.cpp
index 8cabdbe,88c29d6..5dfb0ec
--- a/examples/standardCamera/viewer.cpp
+++ b/examples/standardCamera/viewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/standardCamera/viewer.h
index bb7ecae,2a86c6e..7abdf96
--- a/examples/standardCamera/viewer.h
+++ b/examples/standardCamera/viewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/stereoViewer/main.cpp
index 81c30d2,8165a15..99cb4b7
--- a/examples/stereoViewer/main.cpp
+++ b/examples/stereoViewer/main.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/stereoViewer/stereoViewer.cpp
index 35350af,aa717f4..3ae6e01
--- a/examples/stereoViewer/stereoViewer.cpp
+++ b/examples/stereoViewer/stereoViewer.cpp
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/stereoViewer/stereoViewer.h
index 09f3405,5f149fe..08eedee
--- a/examples/stereoViewer/stereoViewer.h
+++ b/examples/stereoViewer/stereoViewer.h
@@@ -2,7 -2,7 +2,11 @@@
Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
++<<<<<<< HEAD
+ This file is part of the QGLViewer library version 2.6.1.
++=======
+ This file is part of the QGLViewer library version 2.6.3.
++>>>>>>> upstream/2.6.3+dfsg1
http://www.libqglviewer.com - contact at libqglviewer.com
diff --cc examples/stereoViewer/stereoViewer.pro
index 075d3bf,27ca4d6..cf1741d
--- a/examples/stereoViewer/stereoViewer.pro
+++ b/examples/stereoViewer/stereoViewer.pro
@@@ -10,301 -10,4 +10,305 @@@ TARGET = stereoViewe
HEADERS = stereoViewer.h
SOURCES = stereoViewer.cpp main.cpp
++<<<<<<< HEAD
+QT *= xml opengl widgets gui
+
+CONFIG += qt opengl warn_on thread rtti console embed_manifest_exe no_keywords
+
+# --------------------------------------------------------------------------------------
+
+# The remaining of this configuration tries to automatically detect the library paths.
+# In your applications, you can probably simply use (see doc/compilation.html for details) :
+
+#INCLUDEPATH *= C:/Users/debunne/Documents/libQGLViewer-2.6.1
+#LIBS *= -LC:/Users/debunne/Documents/libQGLViewer-2.6.1/QGLViewer -lQGLViewer2
+
+# Change these paths according to your configuration.
+
+# --------------------------------------------------------------------------------------
+
+### Unix configuration ###
+unix {
+ CONFIG -= debug debug_and_release
+ CONFIG *= release
+
+ isEmpty( PREFIX ) {
+ # Try same INCLUDE_DIR and LIB_DIR parameters than for the make install.
+ PREFIX=/usr
+ }
+
+ # LIB_NAME
+ LIB_NAME = libQGLViewer*.so*
+ macx|darwin-g++ {
+ LIB_NAME = libQGLViewer.$${QMAKE_EXTENSION_SHLIB}
+ }
+ hpux {
+ LIB_NAME = libQGLViewer*.sl*
+ }
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIB_NAME = libQGLViewer*.a
+ }
+
+ # LIB_DIR
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = $${PREFIX}/lib
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The library was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ macx|darwin-g++ {
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ # DYLIB was not found, try to find Framework instead
+ LIB_NAME = QGLViewer.framework/QGLViewer
+ LIB_DIR = ~/Library/Frameworks
+ # qmake does not handle tilde
+ LIB_DIR = $$system(cd $${LIB_DIR};pwd)
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_NAME} ) {
+ #message( The framework was found in ../../QGLViewer-build-desktop which will be set as the LIB_DIR )
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_NAME} ) {
+ message( Unable to find $${LIB_NAME} in $${LIB_DIR}. Make sure you have built it. )
+ message( If you have you should run qmake LIB_DIR=/path/to/QGLViewer/$${LIB_NAME} )
+ }
+
+ # The actual directory where the library/framework was found
+ LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR};pwd)
+
+ # INCLUDE_DIR
+ isEmpty( INCLUDE_DIR ) {
+ INCLUDE_DIR = $${PREFIX}/include
+ }
+
+ macx|darwin-g++ {
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR=$${LIB_DIR}/QGLViewer.framework
+ exists( $${LIB_DIR}/QGLViewer.framework/Headers/QGLViewer/qglviewer.h ) {
+ INCLUDE_DIR = $${LIB_DIR}/QGLViewer.framework/Headers
+ }
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ message( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+
+ macx|darwin-g++ {
+ # On Mac, the lib path can be specified in the executable using install_name_tool
+ contains( LIB_NAME, ".*QGLViewer.framework.*" ) {
+ # If framework was not found in a standard directory
+ !contains( LIB_DIR, ".*/Library/Frameworks/*$" ) {
+ QMAKE_LFLAGS += -F$${LIB_DIR}
+ !plugin:QMAKE_POST_LINK=install_name_tool -change QGLViewer.framework/Versions/2/QGLViewer $${LIB_DIR_ABSOLUTE_PATH}/QGLViewer.framework/Versions/2/QGLViewer $${TARGET}.app/Contents/MacOS/$${TARGET}
+ }
+ LIBS += -F$${LIB_DIR} -framework QGLViewer
+ } else {
+ !plugin:QMAKE_POST_LINK=install_name_tool -change libQGLViewer.2.dylib $${LIB_DIR_ABSOLUTE_PATH}/libQGLViewer.2.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+ } else {
+ isEmpty(QMAKE_LFLAGS_RPATH) {
+ !plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+ } else {
+ !plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+ }
+ LIBS *= -L$${LIB_DIR} -lQGLViewer
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= $${LIB_DIR}/$${LIB_NAME}
+ }
+
+ # Remove debugging options in release mode makes files much smaller
+ release:QMAKE_CFLAGS_RELEASE -= -g
+ release:QMAKE_CXXFLAGS_RELEASE -= -g
+
+ # Intermediate files are created in an hidden folder
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+win32 {
+ CONFIG *= debug_and_release
+
+ # Seems to be needed for Visual Studio with Intel compiler
+ DEFINES *= WIN32
+
+ !isEmpty( QGLVIEWER_STATIC ) {
+ DEFINES *= QGLVIEWER_STATIC
+ }
+
+ # INCLUDE_DIR
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ exists( ../../QGLViewer/qglviewer.h ) {
+ # message( libQGLViewer header files were not installed in standard $${INCLUDE_DIR} directory )
+ # message( Headers were found in ../.. which will be set as the INCLUDE_DIR )
+ INCLUDE_DIR = ../..
+ }
+ }
+
+ !exists( $${INCLUDE_DIR}/QGLViewer/qglviewer.h ) {
+ message( Unable to find QGLViewer/qglviewer.h in $${INCLUDE_DIR} )
+ error( Use qmake INCLUDE_DIR=/path/to/QGLViewerDir )
+ }
+
+ # Paths were correctly detected
+ INCLUDEPATH *= $${INCLUDE_DIR}
+ DEPENDPATH *= $${INCLUDE_DIR}
+
+ # LIB_NAME
+ LIB_NAME = QGLViewer
+ build_pass:CONFIG(debug, debug|release) {
+ LIB_NAME = $$join(LIB_NAME,,,d)
+ }
+ LIB_NAME = $$join(LIB_NAME,,,2) #TODO 2
+
+ win32-g++: LIB_FILE_NAME = lib$${LIB_NAME}.a
+ !win32-g++: LIB_FILE_NAME = $${LIB_NAME}.lib
+
+ isEmpty( LIB_DIR ) {
+ LIB_DIR = C:\\Windows\\System32
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/release/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/release
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/Debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/Debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ exists( ../../QGLViewer-build-desktop/debug/$${LIB_FILE_NAME} ) {
+ LIB_DIR = ../../QGLViewer-build-desktop/debug
+ }
+ }
+
+ !exists( $${LIB_DIR}/$${LIB_FILE_NAME} ) {
+ message( Unable to find $${LIB_FILE_NAME} in $${LIB_DIR} )
+ error( Use qmake LIB_DIR=/path/to/QGLViewer/$${LIB_FILE_NAME} )
+ }
+
+ win32-g++ {
+ # The actual directory where the library/framework was found
+ # LIB_DIR_ABSOLUTE_PATH = $$system(cd $${LIB_DIR} && cd)
+
+ isEmpty( QGLVIEWER_STATIC ) {
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ } else {
+ LIBS *= $${LIB_DIR}/$${LIB_FILE_NAME}
+ }
+ }
+
+ !win32-g++ {
+ # Use the Qt DLL version. Only needed with Qt3
+
+ LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ }
+}
+
+
+macx|darwin-g++ {
+ ICON = $${INCLUDEPATH}/QGLViewer/qglviewer.icns
+}
+
+win32 {
+ !designer {
+ exists( ../qglviewer.rc ) {
+ RC_FILE = ../qglviewer.rc
+ }
+ exists( ../examples/qglviewer.rc ) {
+ RC_FILE = ../examples/qglviewer.rc
+ }
+ }
+}
++=======
+ include( ../examples.pri )
++>>>>>>> upstream/2.6.3+dfsg1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libqglviewer.git
More information about the debian-science-commits
mailing list