From 8170aa5b2fc877bc1303b4fc6509421bd69db829 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 24 Jun 2016 20:09:07 +0300 Subject: Use QWidget::grab() instead of deprecated QPixmap::grabWidget(). Change-Id: Icf8004f6b1e878d456dd6493fd2b33d95116c586 Reviewed-by: Allan Sandfeld Jensen --- Tools/QtTestBrowser/launcherwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Tools') 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); -- cgit v1.2.3 From 6d616dc6e4e8d4463a4d75d3b88a2e8ed21c25e5 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 24 Jun 2016 20:10:50 +0300 Subject: Allow making production builds with build-webkit. Don't add CONFIG-=production_build if CONFIG+=production_build was passed in arguments. Change-Id: If401b3a8c1391c71273401257e85274e8db8e2b2 Reviewed-by: Allan Sandfeld Jensen --- Tools/Scripts/webkitdirs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Tools') 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"; -- cgit v1.2.3 From a6c9dd667d534d3342bfba456f9d5c146a924de0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 20 Jun 2016 16:58:05 -0700 Subject: Define NOMINMAX on Windows builds windows.h has a #define macro for min and max, which causes breakage when we write things like std::max or std::numeric_limits::max(). I don't know why I suddenly started getting this, but it's a good idea to do this change. Change-Id: Ib57b52598e2f452985e9fffd1459f01996c7fb7e Reviewed-by: Konstantin Tokarev Reviewed-by: Oswald Buddenhagen Reviewed-by: Simon Hausmann --- Tools/qmake/mkspecs/features/win32/default_post.prf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Tools') 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 -- cgit v1.2.3