Merge remote-tracking branch 'origin/master' into csgterm-refactor

common.pri

@@ -8,6 +8,7 @@ include(flex.pri)
 include(bison.pri)
 include(cgal.pri)
 include(opencsg.pri)
+include(opengl.pri)
 include(glew.pri)
 include(eigen.pri)
 include(boost.pri)

opengl.pri

@@ -0,0 +1,21 @@
+# Prefer QOpenGLWidget for non-Windows platforms
+# To explicitly enable QOpenGLWidget: qmake CONFIG += qopenglwidget
+# To explicitly enable QGLWidget: qmake CONFIG += qglwidget
+!win*: CONFIG += qopenglwidget
+qopenglwidget:!qglwidget:!lessThan(QT_VERSION, 5.4): CONFIG += using_qopenglwidget
+
+using_qopenglwidget {
+  message("Using QOpenGLWidget")
+  DEFINES += USE_QOPENGLWIDGET
+}
+else {
+  message("Using QGLWidget")
+  QT += opengl
+  # see http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
+  # and https://github.com/openscad/openscad/pull/119
+  # ( QT += opengl does not automatically link glu on some DSO systems. )
+  unix:!macx {
+    QMAKE_LIBS_OPENGL *= -lGLU
+    QMAKE_LIBS_OPENGL *= -lX11
+  }
+}

openscad.pro

@@ -116,21 +116,7 @@ mingw* {
 }
 
 CONFIG += qt
-QT += opengl concurrent
-
-qopenglwidget {
-  !lessThan(QT_VERSION, 5.4) {
-    DEFINES += USE_QOPENGLWIDGET
-  }
-}
-
-# see http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
-# and https://github.com/openscad/openscad/pull/119
-# ( QT += opengl does not automatically link glu on some DSO systems. )
-unix:!macx {
-  QMAKE_LIBS_OPENGL *= -lGLU
-  QMAKE_LIBS_OPENGL *= -lX11
-}
+QT += concurrent
 
 netbsd* {
    QMAKE_LFLAGS += -L/usr/X11R7/lib

scripts/uni-build-dependencies.sh

@@ -416,8 +416,10 @@ build_cgal()
 
   # older cmakes have buggy FindBoost that can result in
   # finding the system libraries but OPENSCAD_LIBRARIES include paths
-  FINDBOOST_CMAKE=$OPENSCAD_SCRIPTDIR/../tests/FindBoost.cmake
-  cp $FINDBOOST_CMAKE ./cmake/modules/
+  # NB! This was removed 2015-12-02 - if this problem resurfaces, fix it only for the relevant platforms as this
+  # messes up more recent installations of cmake and CGAL.
+  # FINDBOOST_CMAKE=$OPENSCAD_SCRIPTDIR/../tests/FindBoost.cmake
+  # cp $FINDBOOST_CMAKE ./cmake/modules/
 
   mkdir bin
   cd bin

src/export_svg.cc

@@ -80,7 +80,7 @@ void export_svg(const shared_ptr<const Geometry> &geom, std::ostream &output)
 	output
 		<< "<?xml version=\"1.0\" standalone=\"no\"?>\n"
 		<< "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"
-		<< "\" viewBox=\"" << minx << " " << miny << " " << width << " " << height
+		<< "<svg viewBox=\"" << minx << " " << miny << " " << width << " " << height
 		<< "\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n"
 		<< "<title>OpenSCAD Model</title>\n";
 

src/openscad.cc

@@ -701,7 +701,7 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha
 	updater->init();
 #endif
 
-#if !(QT_VERSION >= 0x050400)
+#ifndef USE_QOPENGLWIDGET
 	// This workaround appears to only be needed when QGLWidget is used QOpenGLWidget
 	// available in Qt 5.4 is much better.
 	QGLFormat fmt;

src/parser.y

@@ -140,7 +140,10 @@ std::string parser_source_path;
 
 input:    /* empty */
         | TOK_USE
-            { rootmodule->registerUse(std::string($1)); }
+            {
+              rootmodule->registerUse(std::string($1));
+              free($1);
+            }
           input
         | statement input
         ;