Update vendored copy of QGLViewer to version 2.9.1

This is needed for Qt6 support. Signed-off-by: Timo Röhling <timo.roehling@fkie.fraunhofer.de>

Author: roehling

octovis/src/extern/QGLViewer/.gitignore

@@ -1,4 +1,4 @@
-This is libQGLViewer version 2.6.3. Packaged on July 10, 2015.
+This is libQGLViewer version 2.9.1.
 
 The complete change log is available in doc/changeLog.html
 

octovis/src/extern/QGLViewer/CHANGELOG

@@ -242,16 +242,16 @@
  </spacer>
  </item>
  <item>
- <widget class="QPushButton" name="okButton">
+ <widget class="QPushButton" name="cancelButton">
  <property name="text">
- <string>OK</string>
+ <string>Cancel</string>
  </property>
  </widget>
  </item>
  <item>
- <widget class="QPushButton" name="cancelButton">
+ <widget class="QPushButton" name="okButton">
  <property name="text">
- <string>Cancel</string>
+ <string>OK</string>
  </property>
  </widget>
  </item>

octovis/src/extern/QGLViewer/INSTALL

@@ -1037,4 +1037,4 @@ Public License instead of this License. But first, please read
 
 -------------------------------------------------------------------------
 
- The QGLViewer library is Copyright (C) 2002-2014 Gilles Debunne.
+ The QGLViewer library is Copyright (C) 2002-2023 Gilles Debunne.

octovis/src/extern/QGLViewer/ImageInterface.ui

@@ -6,10 +6,11 @@
 
 TEMPLATE = lib
 TARGET = QGLViewer
-VERSION = 2.6.3
+VERSION = 2.9.1
 CONFIG *= qt opengl warn_on shared thread create_prl rtti no_keywords
 
-QGL_HEADERS = qglviewer.h \
+QGL_HEADERS = \
+ qglviewer.h \
  camera.h \
  manipulatedFrame.h \
  manipulatedCameraFrame.h \
@@ -22,7 +23,8 @@ QGL_HEADERS = qglviewer.h \
  domUtils.h \
  config.h
 
-SOURCES = qglviewer.cpp \
+SOURCES = \
+ qglviewer.cpp \
  camera.cpp \
  manipulatedFrame.cpp \
  manipulatedCameraFrame.cpp \
@@ -42,9 +44,12 @@ TRANSLATIONS = qglviewer_fr.ts
 
 QT *= xml opengl
 
-contains ( $$[QT_VERSION], "^5.*" ) {
+equals (QT_MAJOR_VERSION, 5) {
 QT *= gui widgets
 }
+equals (QT_MAJOR_VERSION, 6) {
+QT *= gui widgets openglwidgets
+}
 
 !isEmpty( QGLVIEWER_STATIC ) {
  CONFIG *= staticlib
@@ -117,12 +122,24 @@ unix {
 PREFIX_=$${PREFIX}
 }
 isEmpty( LIB_DIR ) {
-LIB_DIR_ = $${PREFIX_}/lib
+macx|darwin-g++ {
+LIB_DIR_ = /Library/Frameworks
+} else {
+LIB_DIR_ = $${PREFIX_}/lib
+}
 } else {
 LIB_DIR_ = $${LIB_DIR}
 }
 isEmpty( INCLUDE_DIR ) {
-INCLUDE_DIR_ = $${PREFIX_}/include
+macx|darwin-g++ {
+isEmpty( PREFIX ) {
+INCLUDE_DIR_ = $${PWD}/Library/Developer/Headers
+} else {
+INCLUDE_DIR_ = $${PREFIX}/Headers
+}
+} else {
+INCLUDE_DIR_ = $${PREFIX_}/include
+}
 } else {
 INCLUDE_DIR_ = $${INCLUDE_DIR}
 }
@@ -147,6 +164,18 @@ unix {
 # GLU is part of the OpenGL framework
 } else {
 QMAKE_LIBS_OPENGL *= -lGLU
+
+isEmpty( NO_QT_VERSION_SUFFIX ) {
+equals (QT_MAJOR_VERSION, 4) {
+TARGET = $$join(TARGET,,,-qt4)
+}
+equals (QT_MAJOR_VERSION, 5) {
+TARGET = $$join(TARGET,,,-qt5)
+}
+equals (QT_MAJOR_VERSION, 6) {
+TARGET = $$join(TARGET,,,-qt6)
+}
+}
 }
 
 MOC_DIR = .moc
@@ -193,18 +222,28 @@ unix {
 
 # "make install" configuration options
 INSTALLS *= target include documentation docImages docRefManual
+
+# "make uninstall" for all targets
+target.uninstall = @echo "uninstall"
+include.uninstall = @echo "uninstall" 
+documentation.uninstall = @echo "uninstall" 
+docImages.uninstall = @echo "uninstall" 
+docRefManual.uninstall = @echo "uninstall" 
 }
 
 
 # -------------------
 # -- M a c O S X --
 # -------------------
 macx|darwin-g++ {
-# This setting creates a Mac framework. Comment out this line to create a dylib instead.
+# Default setting creates a Mac framework. Comment out this line to create a dylib instead.
 !staticlib: CONFIG *= lib_bundle
 
 include.files *= qglviewer.icns
 
+ # Or whatever exists in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+ #QMAKE_MAC_SDK = macosx10.15
+
 lib_bundle {
 FRAMEWORK_HEADERS.version = Versions
 # Should be $$replace(TRANSLATIONS, .ts, .qm), but 'replace' is only available in Qt 4.3

octovis/src/extern/QGLViewer/LICENCE

@@ -1,11 +1,11 @@
 
  l i b Q G L V i e w e r
 
- Version 2.6.3. Packaged on July 10, 2015
+ Version #VERSION#. Packaged on #DATE#
 
 
- Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
- http://www.libqglviewer.com
+ Copyright (C) 2002-2023 Gilles Debunne. All rights reserved.
+ #WEBURL#
  Send e-mail to contact@libqglviewer.com
 
 

octovis/src/extern/QGLViewer/QGLViewer.pro

@@ -22,9 +22,9 @@
 
 /****************************************************************************
 
- Copyright (C) 2002-2014 Gilles Debunne. All rights reserved.
+ Copyright (C) 2002-2023 Gilles Debunne. All rights reserved.
 
- This file is part of the QGLViewer library version 2.6.3.
+ This file is part of the QGLViewer library version 2.9.1.
 
  http://www.libqglviewer.com - contact@libqglviewer.com