Commit a2e4d122 authored by Uwe Woessner's avatar Uwe Woessner
Browse files

windows runtime fixes


Signed-off-by: Uwe Woessner's avatarhpcwoess <woessner@hlrs.de>
parent 255e3331
...@@ -20,7 +20,8 @@ namespace SimulationSlave ...@@ -20,7 +20,8 @@ namespace SimulationSlave
bool DataStoreLibrary::Init() bool DataStoreLibrary::Init()
{ {
library = new (std::nothrow) QLibrary(QString::fromStdString(dataStoreLibraryPath)); std::string suffix = DEBUG_POSTFIX;
library = new (std::nothrow) QLibrary(QString::fromStdString(dataStoreLibraryPath+suffix));
if (!library) if (!library)
{ {
......
...@@ -45,6 +45,8 @@ const std::string Directories::Resolve(const std::string& applicationPath, const ...@@ -45,6 +45,8 @@ const std::string Directories::Resolve(const std::string& applicationPath, const
const std::string Directories::Concat(const std::string& path, const std::string& file) const std::string Directories::Concat(const std::string& path, const std::string& file)
{ {
if (file.length() > 2 && (file[1] == ':' || file[0] == '\\' || file[0] == '/')) // if file is an absolute path, return it directly otherwise prepend it with the specified path
return QDir(QString::fromStdString(file)).absolutePath().toStdString();
return QDir(QString::fromStdString(path) + return QDir(QString::fromStdString(path) +
QDir::separator() + QDir::separator() +
QString::fromStdString(file)).absolutePath().toStdString(); QString::fromStdString(file)).absolutePath().toStdString();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment