Backported 2e3729ab2268f29ee4ff5898f629c4a10c2d6587 to master; redo assemblePath for Win. redo openscad.com to handle spaces in filenames

1 files changed, 7 insertions, 3 deletions

diff --git a/src/openscad.cc b/src/openscad.cc
index ad6cbf9..12e22ce 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -453,12 +453,16 @@ int cmdline(const char *deps_output_file, const std::string &filename, Camera &c
 #include <QApplication>
 #include <QString>
 #include <QDir>
+#include <QFileInfo>
 
 // Only if "fileName" is not absolute, prepend the "absoluteBase".
-static QString assemblePath(const fs::path& absoluteBase,
+static QString assemblePath(const fs::path& absoluteBaseDir,
                             const string& fileName) {
-  return fileName.empty() ? "" : QDir(QString::fromStdString((const string&) absoluteBase))
-    .absoluteFilePath(QString::fromStdString(fileName));
+  if (fileName.empty()) return "";
+  QString qsDir( boosty::stringy( absoluteBaseDir ).c_str() );
+  QString qsFile( fileName.c_str() );
+  QFileInfo info( qsDir, qsFile ); // if qsfile is absolute, dir is ignored.
+  return info.absoluteFilePath();
 }
 
 bool QtUseGUI()