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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I72882df605bc3fc8a8d20118fd4e49207ac92664
This commit is contained in:
Eike Ziller
2018-08-07 09:42:02 +02:00
parent 141f19a652 ff10f8c3a5
commit 847787f146
52 changed files with 306 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/environment.cpp
View File

@@ -49,8 +49,10 @@ public:
toReplace.append(':');
toReplace.append(lib.path());
if (ldLibraryPath.startsWith(toReplace))
set("LD_LIBRARY_PATH", ldLibraryPath.remove(0, toReplace.length()));
if (ldLibraryPath.startsWith(toReplace + ':'))
set("LD_LIBRARY_PATH", ldLibraryPath.remove(0, toReplace.length() + 1));
else if (ldLibraryPath == toReplace)
unset("LD_LIBRARY_PATH");
}
}
};