Qt Creator 日本語化プロジェクトのgitリポジトリです。
git://labs.trolltech.com/creator をcloneして
ひとまず1.0.0-jpブランチを作成して作業していきます。
リビジョン | 35218bbe20bafe22334a9b11ea01417cd078b887 (tree) |
---|---|
日時 | 2009-04-21 23:13:13 |
作者 | con <qtc-committer@noki...> |
コミッター | con |
Add missing type information into gdb calls.
The missing type information lead to non-relocatable debugging helpers
on the Mac.
Reviewed-by: Oswald Buddenhagen
@@ -3145,7 +3145,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren) | ||
3145 | 3145 | sendWatchParameters(params); |
3146 | 3146 | |
3147 | 3147 | QString cmd ="call " |
3148 | - + QString("qDumpObjectData440(") | |
3148 | + + QString("(void*)qDumpObjectData440(") | |
3149 | 3149 | + QString::number(protocol) |
3150 | 3150 | + ',' + "%1+1" // placeholder for token |
3151 | 3151 | + ',' + addr |
@@ -3441,7 +3441,7 @@ void GdbEngine::sendWatchParameters(const QByteArray ¶ms0) | ||
3441 | 3441 | QByteArray params = params0; |
3442 | 3442 | params.append('\0'); |
3443 | 3443 | char buf[50]; |
3444 | - sprintf(buf, "set {char[%d]} qDumpInBuffer = {", params.size()); | |
3444 | + sprintf(buf, "set {char[%d]} &qDumpInBuffer = {", params.size()); | |
3445 | 3445 | QByteArray encoded; |
3446 | 3446 | encoded.append(buf); |
3447 | 3447 | for (int i = 0; i != params.size(); ++i) { |
@@ -4179,14 +4179,14 @@ void GdbEngine::tryLoadDebuggingHelpers() | ||
4179 | 4179 | sendCommand("sharedlibrary " + dotEscape(lib)); |
4180 | 4180 | #endif |
4181 | 4181 | // retreive list of dumpable classes |
4182 | - sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"); | |
4182 | + sendCommand("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"); | |
4183 | 4183 | sendCommand("p (char*)&qDumpOutBuffer", GdbQueryDebuggingHelper); |
4184 | 4184 | } |
4185 | 4185 | |
4186 | 4186 | void GdbEngine::recheckDebuggingHelperAvailability() |
4187 | 4187 | { |
4188 | 4188 | // retreive list of dumpable classes |
4189 | - sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"); | |
4189 | + sendCommand("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"); | |
4190 | 4190 | sendCommand("p (char*)&qDumpOutBuffer", GdbQueryDebuggingHelper); |
4191 | 4191 | } |
4192 | 4192 |