diff options
Diffstat (limited to 'rbutil/rbutilqt/base/utils.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index e185effe2b..277dcb512c 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp | |||
@@ -93,7 +93,11 @@ QString Utils::resolvePathCase(QString path) | |||
93 | { | 93 | { |
94 | int start; | 94 | int start; |
95 | QString realpath; | 95 | QString realpath; |
96 | #if QT_VERSION >= 0x050e00 | ||
97 | QStringList elems = path.split("/", Qt::SkipEmptyParts); | ||
98 | #else | ||
96 | QStringList elems = path.split("/", QString::SkipEmptyParts); | 99 | QStringList elems = path.split("/", QString::SkipEmptyParts); |
100 | #endif | ||
97 | 101 | ||
98 | if(path.isEmpty()) | 102 | if(path.isEmpty()) |
99 | return QString(); | 103 | return QString(); |
@@ -280,17 +284,29 @@ QString Utils::findExecutable(QString name) | |||
280 | QString exepath; | 284 | QString exepath; |
281 | //try autodetect tts | 285 | //try autodetect tts |
282 | #if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD) | 286 | #if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD) |
287 | #if QT_VERSION >= 0x050e00 | ||
288 | QStringList path = QString(getenv("PATH")).split(":", Qt::SkipEmptyParts); | ||
289 | #else | ||
283 | QStringList path = QString(getenv("PATH")).split(":", QString::SkipEmptyParts); | 290 | QStringList path = QString(getenv("PATH")).split(":", QString::SkipEmptyParts); |
291 | #endif | ||
284 | #elif defined(Q_OS_WIN) | 292 | #elif defined(Q_OS_WIN) |
293 | #if QT_VERSION >= 0x050e00 | ||
294 | QStringList path = QString(getenv("PATH")).split(";", Qt::SkipEmptyParts); | ||
295 | #else | ||
285 | QStringList path = QString(getenv("PATH")).split(";", QString::SkipEmptyParts); | 296 | QStringList path = QString(getenv("PATH")).split(";", QString::SkipEmptyParts); |
286 | #endif | 297 | #endif |
298 | #endif | ||
287 | LOG_INFO() << "system path:" << path; | 299 | LOG_INFO() << "system path:" << path; |
288 | for(int i = 0; i < path.size(); i++) | 300 | for(int i = 0; i < path.size(); i++) |
289 | { | 301 | { |
290 | QString executable = QDir::fromNativeSeparators(path.at(i)) + "/" + name; | 302 | QString executable = QDir::fromNativeSeparators(path.at(i)) + "/" + name; |
291 | #if defined(Q_OS_WIN) | 303 | #if defined(Q_OS_WIN) |
292 | executable += ".exe"; | 304 | executable += ".exe"; |
305 | #if QT_VERSION >= 0x050e00 | ||
306 | QStringList ex = executable.split("\"", Qt::SkipEmptyParts); | ||
307 | #else | ||
293 | QStringList ex = executable.split("\"", QString::SkipEmptyParts); | 308 | QStringList ex = executable.split("\"", QString::SkipEmptyParts); |
309 | #endif | ||
294 | executable = ex.join(""); | 310 | executable = ex.join(""); |
295 | #endif | 311 | #endif |
296 | if(QFileInfo(executable).isExecutable()) | 312 | if(QFileInfo(executable).isExecutable()) |