diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:09:57 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:10:05 +0200 |
commit | d9ca6bcb08d9560e91a1ca1fe4542c26791b26c1 (patch) | |
tree | ad7d8724aa61c72547a0a85a4d460a7d3bf30be9 | |
parent | b20434396179754b292fd4a9164c2b3e338129a1 (diff) | |
parent | f010d89fa2e4aa463d3392c5f37fa22efd48e04e (diff) | |
download | qtwebkit-d9ca6bcb08d9560e91a1ca1fe4542c26791b26c1.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7ef71d5a3af2acb9e41fffd9a215980dbace9d90
-rw-r--r-- | Source/JavaScriptCore/jsc.pro | 2 | ||||
-rw-r--r-- | Source/WTF/WTF.pri | 2 | ||||
-rw-r--r-- | Source/WTF/wtf/MathExtras.h | 4 | ||||
-rw-r--r-- | Tools/QtTestBrowser/launcherwindow.cpp | 2 | ||||
-rwxr-xr-x | Tools/Scripts/webkitdirs.pm | 2 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/win32/default_post.prf | 4 |
6 files changed, 10 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/jsc.pro b/Source/JavaScriptCore/jsc.pro index 91ebcc2a0..4efe024d6 100644 --- a/Source/JavaScriptCore/jsc.pro +++ b/Source/JavaScriptCore/jsc.pro @@ -13,7 +13,7 @@ QT -= gui win32-*: CONFIG += console win32-msvc*: CONFIG += exceptions_off stl_off -win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 +contains(MSVC_VER, "(9|10|11|12)\.0)"): INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 WEBKIT += javascriptcore wtf diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index b4f7765ac..1f4866d66 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -49,4 +49,4 @@ mac { } # MSVC is lacking stdint.h as well as inttypes.h. -win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc|wince*: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 +contains(MSVC_VER, "(9|10|11|12)\.0"): INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 diff --git a/Source/WTF/wtf/MathExtras.h b/Source/WTF/wtf/MathExtras.h index 859722386..36c7d0e8c 100644 --- a/Source/WTF/wtf/MathExtras.h +++ b/Source/WTF/wtf/MathExtras.h @@ -43,7 +43,7 @@ #include <machine/ieee.h> #endif -#if OS(QNX) +#if OS(QNX) || COMPILER(INTEL) // FIXME: Look into a way to have cmath import its functions into both the standard and global // namespace. For now, we include math.h since the QNX cmath header only imports its functions // into the standard namespace. @@ -106,7 +106,7 @@ inline bool isinf(double x) { return !finite(x) && !isnand(x); } #endif -#if OS(OPENBSD) +#if OS(OPENBSD) && __cplusplus < 201103L namespace std { diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp index d2933979b..0cb0ab2ce 100644 --- a/Tools/QtTestBrowser/launcherwindow.cpp +++ b/Tools/QtTestBrowser/launcherwindow.cpp @@ -782,7 +782,7 @@ void LauncherWindow::print() void LauncherWindow::screenshot() { - QPixmap pixmap = QPixmap::grabWidget(m_view); + QPixmap pixmap = m_view->grab(); QLabel* label = 0; label = new QLabel; label->setAttribute(Qt::WA_DeleteOnClose); diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index cc30b16f5..1eeabfe9d 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -2231,7 +2231,7 @@ sub buildQMakeProjects } # Using build-webkit to build assumes you want a developer-build - push @buildArgs, "CONFIG-=production_build"; + push @buildArgs, "CONFIG-=production_build" unless grep { $_ eq "CONFIG+=production_build" } @buildArgs; my $svnRevision = currentSVNRevision(); my $previousSvnRevision = "unknown"; diff --git a/Tools/qmake/mkspecs/features/win32/default_post.prf b/Tools/qmake/mkspecs/features/win32/default_post.prf index e2567233f..c296ae1f7 100644 --- a/Tools/qmake/mkspecs/features/win32/default_post.prf +++ b/Tools/qmake/mkspecs/features/win32/default_post.prf @@ -12,6 +12,10 @@ mingw { QMAKE_LIBDIR_POST += $$split(TMPPATH,";") } +# Make sure windows.h doesn't define max() macro +# (it screws up use like std::max and std::numeric_limits::max) +DEFINES += NOMINMAX + # Disable a few warnings. The same warnings are also disabled # in WebKitLibraries/win/tools/vsprops/common.vsprops win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996 |