Updated patch collection.

This commit is contained in:
LoRd_MuldeR 2012-09-28 12:51:51 +02:00
parent 703297c665
commit 54d92ae4c4
3 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff --git "a/E:\\QtSource\\4.8.3\\src\\gui\\kernel\\qdnd_win.org" "b/E:\\QtSource\\4.8.3\\src\\gui\\kernel\\qdnd_win.cpp"
index 20dfa76..c0268e1 100644
--- "a/E:\\QtSource\\4.8.3\\src\\gui\\kernel\\qdnd_win.org"
+++ "b/E:\\QtSource\\4.8.3\\src\\gui\\kernel\\qdnd_win.cpp"
@@ -712,7 +712,7 @@ QOleDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
return NOERROR;
}
- while (dragOverWidget && dragOverWidget != widget && !acceptsDrop(dragOverWidget))
+ while (dragOverWidget && !dragOverWidget->isWindow() && !acceptsDrop(dragOverWidget))
dragOverWidget = dragOverWidget->parentWidget();
if (!dragOverWidget || !acceptsDrop(dragOverWidget)) {

View File

@ -0,0 +1,21 @@
diff --git "qprocess_win.original" "qprocess_win.cpp"
index 417ee39..68721a3 100644
--- "a\\src\\corelib\\io\\qprocess_win.original"
+++ "b\\src\\corelib\\io\\qprocess_win.cpp"
@@ -413,6 +413,7 @@ void QProcessPrivate::startProcess()
#else
DWORD dwCreationFlags = CREATE_NO_WINDOW;
dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT;
+ dwCreationFlags |= CREATE_BREAKAWAY_FROM_JOB;
STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0,
(ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
(ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
@@ -858,7 +859,7 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a
0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
success = CreateProcess(0, (wchar_t*)args.utf16(),
- 0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE, 0,
+ 0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE | CREATE_BREAKAWAY_FROM_JOB, 0,
workingDir.isEmpty() ? 0 : (wchar_t*)workingDir.utf16(),
&startupInfo, &pinfo);
#endif // Q_OS_WINCE