From 8fb1dbef9c6606b49371f4c7baa8a21419146990 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 19 Apr 2017 11:12:10 +0200 Subject: Move qmake files to standard locations The tools/qmake directory is a left over from webkit where qmake was but one of many buildsystems. This is not necessary for qtwebengine, so we can instead use the standard locations. Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183 Reviewed-by: Kai Koehne Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 -- 1 file changed, 2 deletions(-) (limited to '.qmake.conf') diff --git a/.qmake.conf b/.qmake.conf index a988f0fac..71d8c7d74 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,3 @@ -QMAKEPATH += $$PWD/tools/qmake - # Resolve root directories for sources QTWEBENGINE_ROOT = $$PWD QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD) -- cgit v1.2.3 From bc5b7abd8ab9681dfcadc8c4a7c211fac7ca4b6d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 10 May 2017 19:06:59 +0200 Subject: Bump version Change-Id: I77ffe8325e30fdd09f76ade1dc002d9550a4e178 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.qmake.conf') diff --git a/.qmake.conf b/.qmake.conf index 71d8c7d74..ebb061d6a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD) load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.9.0 +MODULE_VERSION = 5.9.1 -- cgit v1.2.3