feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Some QString -> FileName transformation

Browse Source 
Change-Id: I4a8a8f68bb1e52750380218793ec3029b488c01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Orgad Shaneh
2014-07-15 23:32:11 +03:00
committed by Orgad Shaneh
parent f8dfa03d4f
commit 71b56d2b9c
62 changed files with 237 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/consoleprocess_unix.cpp
View File

@@ -372,7 +372,7 @@ QString ConsoleProcess::defaultTerminalEmulator()
const Environment env = Environment::systemEnvironment();
const int terminalCount = int(sizeof(knownTerminals) / sizeof(knownTerminals[0]));
for (int i = 0; i < terminalCount; ++i) {
QString result = env.searchInPath(QLatin1String(knownTerminals[i].binary));
QString result = env.searchInPath(QLatin1String(knownTerminals[i].binary)).toString();
if (!result.isEmpty()) {
result += QLatin1Char(' ');
result += QLatin1String(knownTerminals[i].options);
@@ -388,7 +388,7 @@ QStringList ConsoleProcess::availableTerminalEmulators()
const Environment env = Environment::systemEnvironment();
const int terminalCount = int(sizeof(knownTerminals) / sizeof(knownTerminals[0]));
for (int i = 0; i < terminalCount; ++i) {
QString terminal = env.searchInPath(QLatin1String(knownTerminals[i].binary));
QString terminal = env.searchInPath(QLatin1String(knownTerminals[i].binary)).toString();
if (!terminal.isEmpty()) {
terminal += QLatin1Char(' ');
terminal += QLatin1String(knownTerminals[i].options);