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 /Tools | |
| parent | b20434396179754b292fd4a9164c2b3e338129a1 (diff) | |
| parent | f010d89fa2e4aa463d3392c5f37fa22efd48e04e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7ef71d5a3af2acb9e41fffd9a215980dbace9d90
Diffstat (limited to 'Tools')
| -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 |
3 files changed, 6 insertions, 2 deletions
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 |