vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

fix issue #671 (regression)

jawsreader
Don Bright 2014-02-24 18:38:45 -06:00
parent 776df9fc0e
commit 020d65eff0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openscad.cc
View File

@ -457,10 +457,14 @@ int cmdline(const char *deps_output_file, const std::string &filename, Camera &c
#include <QDir>
// 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 = QString::fromUtf8( boosty::stringy( absoluteBaseDir ).c_str() );
QString qsFile = QString::fromUtf8( fileName.c_str() );
// if qsfile is absolute, dir is ignored. (see documentation of QFileInfo)
QFileInfo info( qsDir, qsFile );
return info.absoluteFilePath();
}
bool QtUseGUI()