fixed Suitesparse finder on mac

Core/Core.cc

@@ -254,7 +254,7 @@ Core::init() {
     connect(coreWidget_, SIGNAL(applyOptions())       , this, SLOT(applyOptions()));
     connect(coreWidget_, SIGNAL(saveOptions())        , this, SLOT(saveOptions()));
     connect(coreWidget_, SIGNAL(recentOpen(QAction*)) , this, SLOT(slotRecentOpen(QAction*)));
-    connect(coreWidget_, SIGNAL(exit())               , this, SLOT(slotExit()));
+    connect(coreWidget_, SIGNAL(exit())               , this, SLOT(slotExit()), Qt::QueuedConnection); // queue to avoid destroying the core widget during event handling
 
 
     connect( coreWidget_, SIGNAL( resizeViewers(int,int) ), this, SLOT( resizeViewers(int,int) ) );

cmake/CMakeLists.txt

@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 )
 
 # ACG Environment default settings
 # This is ugly but currently we need to work around the default installed 5.3 on debian
-if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ )
+if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.11.2/5.11.2/gcc_64 )
   # Default to this install path for QT%_INSTALL_DIR
-  set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
+  set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.11.2/5.11.2/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment using QT 5.11.2" )
 endif()
 
 if ( WIN32 )

cmake/FindQwt6.cmake

@@ -32,16 +32,20 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
 endif()
 
 if (QT5_FOUND)
-    if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.10.1" )
-       SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.10.1")
-    else()
-      if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.9.0" )
-         SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0")
-      else()                 
-        if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.8.0" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1")
-          SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0")
-        else()
-          SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5")
+    if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.11.2")
+      SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.11.2")
+    else() 
+      if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.10.1" )
+         SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.10.1")
+      else()
+        if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.9.0" )
+           SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0")
+        else()                 
+          if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.8.0" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1")
+            SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0")
+          else()
+            SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5")
+          endif()
         endif()
       endif()
     endif()

libs_required/ACG/Scenegraph/TextureNode.cc

@@ -502,26 +502,27 @@ void TextureNode::enter(GLState& _state , const DrawModes::DrawMode& _drawmode)
                       open_volume_mesh_texture_draw_modes_ ))
    {
      if(_state.compatibilityProfile())
-      ACG::GLState::enable( GL_TEXTURE_2D );
+       ACG::GLState::enable( GL_TEXTURE_2D );
       
-      mipmapping_globally_active_ = _state.mipmapping_allowed();
-      
-      // Check if mipmapping status has changed
-      if(_state.mipmapping_allowed() != last_mipmapping_status_) {
-          
-              // Update mipmaps
-              updateMipmaps(mipmapping_globally_active_ && mipmapping_);
-              
-              // Keep track of changes
-              last_mipmapping_status_ = _state.mipmapping_allowed();
-          
-      }
-      
-      if ( !textures_.empty() ) {
-        textures_[activeTexture_].tex->bind();
-      }
-      if(_state.compatibilityProfile())
-      glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, tex_mode_ );
+     mipmapping_globally_active_ = _state.mipmapping_allowed();
+     
+     // Check if mipmapping status has changed
+     if(_state.mipmapping_allowed() != last_mipmapping_status_) {
+         
+             // Update mipmaps
+             updateMipmaps(mipmapping_globally_active_ && mipmapping_);
+             
+             // Keep track of changes
+             last_mipmapping_status_ = _state.mipmapping_allowed();
+         
+     }
+     
+     if ( !textures_.empty() ) {
+       textures_[activeTexture_].tex->bind();
+     }
+
+     if(_state.compatibilityProfile())
+       glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, tex_mode_ );
 
 //       if (_drawmode & DrawModes::SOLID_FACES_COLORED_2DTEXTURED_FACE_SMOOTH_SHADED)
 //         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);