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

Merge remote branch 'origin/1.3'

Browse Source
This commit is contained in:
con
2009-12-03 15:15:08 +01:00
parent 36b6810c74 42f849c4da
commit 8b9c748abb
8 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/trk/launcher.cpp
View File

@@ -467,7 +467,7 @@ void Launcher::closeRemoteFile(bool failed)
{
QByteArray ba;
appendInt(&ba, d->m_copyState.copyFileHandle, TargetByteOrder);
appendInt(&ba, QDateTime::currentDateTime().toTime_t(), TargetByteOrder);
appendDateTime(&ba, QDateTime::currentDateTime(), TargetByteOrder);
d->m_device->sendTrkMessage(TrkCloseFile,
failed ? TrkCallback() : TrkCallback(this, &Launcher::handleFileCopied),
ba);