OSDN Git Service

Updated Qt patches for 4.8.4 release.
authorLoRd_MuldeR <mulder2@gmx.de>
Thu, 29 Nov 2012 23:22:20 +0000 (00:22 +0100)
committerLoRd_MuldeR <mulder2@gmx.de>
Thu, 29 Nov 2012 23:22:20 +0000 (00:22 +0100)
doc/Changelog.html
etc/Patches/Qt-v4.8.4-QProcess-BreakawayFromJob.V1.diff [new file with mode: 0644]
etc/Patches/deprecated/Qt-v4.8.3-DragAndDropFix.V1.diff [moved from etc/Patches/Qt-v4.8.3-DragAndDropFix.V1.diff with 100% similarity]
etc/Patches/deprecated/Qt-v4.8.3-QProcess-BreakawayFromJob.V1.diff [moved from etc/Patches/Qt-v4.8.3-QProcess-BreakawayFromJob.V1.diff with 100% similarity]

index bd74290..299aef0 100644 (file)
@@ -21,7 +21,7 @@ a:visited { color: #0000EE; }
 <li>Upgraded build environment to Microsoft Visual Studio 2012 with Update-1
 <li>Added option to select the "overwrite mode" to advanced options tab
 <li>Added option to filter the log entries on the "processing" dialog (see context menu)
-<li>Updated Qt runtime libraries to v4.8.4 (2012-11-23), compiled with MSVC 11.0
+<li>Updated Qt runtime libraries to v4.8.4 (2012-11-29), compiled with MSVC 11.0
 <li>Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.5 (2012-11-23)
 </ul><br>
 
diff --git a/etc/Patches/Qt-v4.8.4-QProcess-BreakawayFromJob.V1.diff b/etc/Patches/Qt-v4.8.4-QProcess-BreakawayFromJob.V1.diff
new file mode 100644 (file)
index 0000000..5d64815
--- /dev/null
@@ -0,0 +1,21 @@
+diff --git "a/D:\\Qt\\QtSource\\4.8.4\\src\\corelib\\io\\qprocess_win.org" "b/D:\\Qt\\QtSource\\4.8.4\\src\\corelib\\io\\qprocess_win.cpp"
+index b78ad7d..28f08ff 100644
+--- "a/D:\\Qt\\QtSource\\4.8.4\\src\\corelib\\io\\qprocess_win.org"
++++ "b/D:\\Qt\\QtSource\\4.8.4\\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