diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:18:03 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:18:04 +0100 |
commit | 9520f82e00f26d7d217f7d2777ba2f3cd958d012 (patch) | |
tree | f892162ab33e9b1b7ffa9819fbec49af86196802 | |
parent | 9b5cc9e6082366cbe6e76c29d493448ef496b43e (diff) | |
parent | 78985c5c2c4ec8c7d06bf0c59c5534f968d62f07 (diff) | |
download | qtscript-9520f82e00f26d7d217f7d2777ba2f3cd958d012.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1f7bde2c0f17d6cdb2914ef2b3aff271ad584321
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri | 2 | ||||
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 4 | ||||
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 22 | ||||
-rw-r--r-- | src/script/doc/qtscript.qdocconf | 1 | ||||
-rw-r--r-- | src/script/script.pro | 2 | ||||
-rw-r--r-- | src/scripttools/doc/qtscripttools.qdocconf | 1 |
6 files changed, 27 insertions, 5 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index f8f7529..2298de3 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -41,7 +41,7 @@ DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF win32-* { # Prevent definition of min, max macros in windows.h DEFINES+=NOMINMAX - LIBS += -lwinmm + LIBS_PRIVATE += -lwinmm } contains(JAVASCRIPTCORE_JIT,yes) { DEFINES+=ENABLE_JIT=1 diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index fc5676a..81a1d8a 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -90,7 +90,7 @@ inline bool signbit(double x) { struct ieee_double *p = (struct ieee_double *)&x #endif -#if COMPILER(MSVC) || COMPILER(RVCT) +#if (COMPILER(MSVC) && _MSC_VER < 1800) || COMPILER(RVCT) // We must not do 'num + 0.5' or 'num - 0.5' because they can cause precision loss. static double round(double num) @@ -115,7 +115,7 @@ inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); } #endif -#if COMPILER(MSVC) +#if COMPILER(MSVC) && _MSC_VER < 1800 inline bool isinf(double num) { return !_finite(num) && !_isnan(num); } inline bool isnan(double num) { return !!_isnan(num); } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index d483806..94de5ec 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -325,7 +325,27 @@ #endif /* ARM */ +#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) +#define WTF_CPU_MIPS 1 +#include <sgidefs.h> +#if defined(__MIPSEB__) +#define WTF_CPU_BIG_ENDIAN 1 +#endif +/* CPU(MIPS64) - MIPS 64-bit both BIG and LITTLE endian */ +#if defined(_MIPS_SIM_ABI64) && (_MIPS_SIM == _MIPS_SIM_ABI64) +#define WTF_CPU_MIPS64 1 +#endif +/* CPU(MIPSN32) - MIPS N32 ABI both BIG and LITTLE endian */ +#if defined(_MIPS_SIM_ABIN32) && (_MIPS_SIM == _MIPS_SIM_ABIN32) +#define WTF_CPU_MIPSN32 1 +#endif + +/* CPU(MIPS32) - MIPS O32 ABI both BIG and LITTLE endian */ +#if defined(_MIPS_SIM_ABI32) && (_MIPS_SIM == _MIPS_SIM_ABI32) +#define WTF_CPU_MIPS32 1 +#endif +#endif /* __mips__ */ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ @@ -876,7 +896,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) +#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) #define WTF_USE_JSVALUE64 1 #elif CPU(ARM) || CPU(PPC64) #define WTF_USE_JSVALUE32 1 diff --git a/src/script/doc/qtscript.qdocconf b/src/script/doc/qtscript.qdocconf index a58e1e7..b534300 100644 --- a/src/script/doc/qtscript.qdocconf +++ b/src/script/doc/qtscript.qdocconf @@ -2,6 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) # Name of the project which must match the outputdir. Determines the .index file project = QtScript +url = http://qt-project.org/doc/qt-$QT_VER # Directories in which to search for files to document and images. # By default set to the root directory of the project for sources diff --git a/src/script/script.pro b/src/script/script.pro index 49b6ded..8cb2f62 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -26,7 +26,7 @@ win32-msvc*: QMAKE_CXXFLAGS += -wd4396 -wd4099 wince* { INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-wince INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-win32 - LIBS += -lmmtimer + LIBS_PRIVATE += -lmmtimer } mac { diff --git a/src/scripttools/doc/qtscripttools.qdocconf b/src/scripttools/doc/qtscripttools.qdocconf index 95ebf8a..0cc071a 100644 --- a/src/scripttools/doc/qtscripttools.qdocconf +++ b/src/scripttools/doc/qtscripttools.qdocconf @@ -2,6 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) # Name of the project which must match the outputdir. Determines the .index file project = QtScriptTools +url = http://qt-project.org/doc/qt-$QT_VER # Directories in which to search for files to document and images. # By default set to the root directory of the project for sources |