diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-12 01:07:49 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-12 01:07:49 (GMT) |
| commit | 5f03fbee6bbaf411e2bd4095c9911fe8dc6df210 (patch) | |
| tree | 5499de500a2a22f2d0e2c8844e97dc09ab49fc38 /src/openscad.cc | |
| parent | 9899f75a257c791c4272b60aa0c96e46f9acb16b (diff) | |
| parent | 30ab30f32a113daea51e4cefc874c82881d0594c (diff) | |
Merge branch 'master' of github.com:maandree/openscad into maandree-master
Diffstat (limited to 'src/openscad.cc')
| -rw-r--r-- | src/openscad.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 682ccb7..138c689 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -492,7 +492,7 @@ int main(int argc, char **argv) #endif QString qfilename; - if (filename) qfilename = QString::fromStdString(boosty::stringy(boosty::absolute(filename))); + if (filename) qfilename = QString::fromUtf8(boosty::stringy(boosty::absolute(filename)).c_str()); #if 0 /*** disabled by clifford wolf: adds rendering artefacts with OpenCSG ***/ // turn on anti-aliasing @@ -507,7 +507,7 @@ int main(int argc, char **argv) if (vm.count("input-file")) { inputFiles = vm["input-file"].as<vector<string> >(); for (vector<string>::const_iterator infile = inputFiles.begin()+1; infile != inputFiles.end(); infile++) { - new MainWindow(QString::fromStdString(boosty::stringy((original_path / *infile)))); + new MainWindow(QString::fromUtf8(boosty::stringy((original_path / *infile).c_str())); } } app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); |