diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 11:46:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 11:46:41 (GMT) |
| commit | 8928e37c8b1b375e74c5981915c034123de11b3d (patch) | |
| tree | 0dfa96087ca129f25d2e59265f73a046d75d274f /src/3rdparty/javascriptcore/JavaScriptCore | |
| parent | ef30a6f336d55c813423bf139d8363f50181179f (diff) | |
| parent | 9e20aac8d44a0e3e3ac4c5d67376f50071987b91 (diff) | |
| download | Qt-8928e37c8b1b375e74c5981915c034123de11b3d.zip Qt-8928e37c8b1b375e74c5981915c034123de11b3d.tar.gz Qt-8928e37c8b1b375e74c5981915c034123de11b3d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (54 commits)
Better check in QStaticText testcase if xformed text is supported
Fix point drawing in QPainter.
Expand indicator would not be displayed after removal of a collapsed item's child
Avoid always detaching QStaticText
Doc: fix formatting
Make the qpainter test compile under Windows.
make QtScript compatible with mingw 64
Fix QStaticText test on QWS
Add licence header
Fixed a warning.
WinCE compilation fix
Fixed hypersensitive drag on QHeaderViews
Fix seg-fault when no X11 desktop environment is present
Remove comment in drawStaticTextItem() in GL engine
Separate Phonon and gstreamer defines in qtconfig
Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 5381ceeb37d97365cfb2f037650dbb4e495bca4e )"
Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 9303f6d67fb964b71ed3e7361367c3ccfaba5e0a )"
Fix compilation on Windows
Compile with QT_USE_FAST_OPERATOR_PLUS
Fix compilation error in openVG
...
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp index 1e717cb..abe15c8 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp @@ -241,7 +241,7 @@ NEVER_INLINE CollectorBlock* Heap::allocateBlock() #elif PLATFORM(WINCE) void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); #elif PLATFORM(WIN_OS) -#if COMPILER(MINGW) +#if COMPILER(MINGW) && !PLATFORM(X86_64) void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE); #else void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE); @@ -327,7 +327,7 @@ NEVER_INLINE void Heap::freeBlock(CollectorBlock* block) #elif PLATFORM(WINCE) VirtualFree(block, 0, MEM_RELEASE); #elif PLATFORM(WIN_OS) -#if COMPILER(MINGW) +#if COMPILER(MINGW) && !PLATFORM(X86_64) __mingw_aligned_free(block); #else _aligned_free(block); @@ -617,7 +617,7 @@ static inline void* currentThreadStackBase() MOV pTib, EAX } return static_cast<void*>(pTib->StackBase); -#elif PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC) +#elif PLATFORM(WIN_OS) && PLATFORM(X86_64) && (COMPILER(MSVC) ||COMPILER(GCC)) PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb()); return reinterpret_cast<void*>(pTib->StackBase); #elif PLATFORM(WIN_OS) && PLATFORM(X86) && COMPILER(GCC) |