diff options
| author | axis <qt-info@nokia.com> | 2010-03-15 11:00:38 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-15 11:00:38 (GMT) |
| commit | b65a79f7079106233e32251e9a6ab0639cdad662 (patch) | |
| tree | 66eb210b7a611a161cc06bf724f61bc5ac710072 /src/corelib/io | |
| parent | fc3f88b5c22c12c8f61da152ca82cb10f18d2902 (diff) | |
| parent | 065f26ef3996368ba67ff5d8e34b20106c359a95 (diff) | |
| download | Qt-b65a79f7079106233e32251e9a6ab0639cdad662.zip Qt-b65a79f7079106233e32251e9a6ab0639cdad662.tar.gz Qt-b65a79f7079106233e32251e9a6ab0639cdad662.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qprocess_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index f3fc28e..cb25a58 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -525,7 +525,7 @@ qint64 QProcessPrivate::readFromStderr(char *data, qint64 maxlen) } -static BOOL CALLBACK qt_terminateApp(HWND hwnd, LPARAM procId) +static BOOL QT_WIN_CALLBACK qt_terminateApp(HWND hwnd, LPARAM procId) { DWORD currentProcId = 0; GetWindowThreadProcessId(hwnd, ¤tProcId); |