--- /dev/null
+diff --git "a/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\3rdparty\\javascriptcore\\JavaScriptCore\\wtf\\MathExtras.org" "b/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\3rdparty\\javascriptcore\\JavaScriptCore\\wtf\\MathExtras.h"
+index a18949e..27bdb50 100644
+--- "a/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\3rdparty\\javascriptcore\\JavaScriptCore\\wtf\\MathExtras.org"
++++ "b/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\3rdparty\\javascriptcore\\JavaScriptCore\\wtf\\MathExtras.h"
+@@ -125,7 +125,10 @@ inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); }
+
+ inline bool isinf(double num) { return !_finite(num) && !_isnan(num); }
+ inline bool isnan(double num) { return !!_isnan(num); }
++
++#if _MSC_VER < 1800
+ inline bool signbit(double num) { return _copysign(1.0, num) < 0; }
++#endif
+
+ inline double nextafter(double x, double y) { return _nextafter(x, y); }
+ inline float nextafterf(float x, float y) { return x > y ? x - FLT_EPSILON : x + FLT_EPSILON; }
--- /dev/null
+diff --git "a/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\corelib\\io\\qprocess_win.ori" "b/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\corelib\\io\\qprocess_win.cpp"
+index 6cf6d65..3b5c4fb 100644
+--- "a/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\corelib\\io\\qprocess_win.ori"
++++ "b/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\corelib\\io\\qprocess_win.cpp"
+@@ -414,6 +414,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,
+@@ -859,7 +860,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
--- /dev/null
+diff --git "a/D:\\Qt\\QtSource\\4.8.5-VS2013\\mkspecs\\win32-msvc2012\\qmake.orig" "b/D:\\Qt\\QtSource\\4.8.5-VS2013\\mkspecs\\win32-msvc2012\\qmake.conf"
+index 875978b..06ff5f3 100644
+--- "a/D:\\Qt\\QtSource\\4.8.5-VS2013\\mkspecs\\win32-msvc2012\\qmake.orig"
++++ "b/D:\\Qt\\QtSource\\4.8.5-VS2013\\mkspecs\\win32-msvc2012\\qmake.conf"
+@@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = MSBUILD
+ TEMPLATE = app
+ CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
+ QT += core gui
+-DEFINES += UNICODE WIN32
++DEFINES += UNICODE WIN32 _USING_V110_SDK71_
+ QMAKE_COMPILER_DEFINES += _MSC_VER=1700 WIN32
+
+ QMAKE_CC = cl
+@@ -19,11 +19,11 @@ QMAKE_YACCFLAGS = -d
+ QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
+ QMAKE_CFLAGS_WARN_ON = -W3
+ QMAKE_CFLAGS_WARN_OFF = -W0
+-QMAKE_CFLAGS_RELEASE = -O2 -MD
+-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
++QMAKE_CFLAGS_RELEASE = -Ox -Ob2 -Oi -Ot -Oy -MT -arch:IA32 -fp:fast -GS-
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -Ox -Ob2 -Oi -Ot -Oy -MT -arch:IA32 -fp:fast -GS- -Zi
+ QMAKE_CFLAGS_DEBUG = -Zi -MDd
+ QMAKE_CFLAGS_YACC =
+-QMAKE_CFLAGS_LTCG = -GL
++QMAKE_CFLAGS_LTCG = -GL -Gy
+ QMAKE_CFLAGS_MP = -MP
+
+ QMAKE_CXX = $$QMAKE_CC
+@@ -59,13 +59,13 @@ QMAKE_LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT
+ QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO
+ QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
+ QMAKE_LFLAGS_DEBUG = /DEBUG
+-QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE
+-QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS
++QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE,5.01
++QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01
+ QMAKE_LFLAGS_EXE = \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
+ QMAKE_LFLAGS_DLL = /DLL
+ QMAKE_LFLAGS_LTCG = /LTCG
+
+-QMAKE_LIBS_CORE = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib
++QMAKE_LIBS_CORE = E:\\DeLpHi\\EncodePointerLib\\Release\\EncodePointer.lib kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib
+ QMAKE_LIBS_GUI = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
+ QMAKE_LIBS_NETWORK = ws2_32.lib
+ QMAKE_LIBS_OPENGL = glu32.lib opengl32.lib gdi32.lib user32.lib
OSDN Git Service
