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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/remotelinux/deploymentinfo.cpp

Change-Id: I92af9f9f558a76db78f838b0ccdfb8ad3d47af25
This commit is contained in:
Oswald Buddenhagen
2012-08-28 15:13:32 +02:00
parent edcf76613b f35f55091d
commit 6529e874e4
40 changed files with 350 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/id.cpp
View File

@@ -107,7 +107,7 @@ static int theId(const char *str)
if (lastUid == 0)
stringFromId.append(QByteArray());
res = ++lastUid;
sh.str = strdup(sh.str);
sh.str = qstrdup(sh.str);
idFromString[sh] = res;
stringFromId.append(QByteArray::fromRawData(sh.str, sh.n));
}