From 1dead935cd5a8082738d54157819f768f6ed42e3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 3 Nov 2016 18:26:29 +0100 Subject: remove dependencies from sync.profile the CI obtains them from the qt5 super repo nowadays. Change-Id: Ifd67aa5d0e86b370c8b87fc6654f00dece1abad7 Reviewed-by: Liang Qi --- sync.profile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sync.profile b/sync.profile index fd3db4d..6d035bc 100644 --- a/sync.profile +++ b/sync.profile @@ -1,16 +1,2 @@ -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) -# -%dependencies = ( - "qtbase" => "", - "qtwebkit" => "", - "qtscript" => "", - "qtsvg" => "", - "qtxmlpatterns" => "", - "qtdeclarative" => "", - "qttools" => "", +%modules = ( # path to module name map ); -- cgit v1.2.1 From 184189043bb69a0f14dd019e708decc98a4385f9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 6 Dec 2016 18:48:41 +0100 Subject: remove dead usage of DEPLOYMENT_PLUGIN wince is not supported any more, so the scope was dead. Change-Id: I6ea7144c7a93794163b920846ba671beae945701 Reviewed-by: Jake Petroules --- examples/webkitwidgets/browser/browser.pro | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/webkitwidgets/browser/browser.pro b/examples/webkitwidgets/browser/browser.pro index 97559ed..caca413 100644 --- a/examples/webkitwidgets/browser/browser.pro +++ b/examples/webkitwidgets/browser/browser.pro @@ -89,10 +89,6 @@ mac { } } -wince*: { - DEPLOYMENT_PLUGIN += qjpeg qgif -} - EXAMPLE_FILES = Info_mac.plist browser.icns browser.ico browser.rc # install -- cgit v1.2.1 From ac8c2122bba9e2ba8887fb5586ca4a8a119cc404 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Jan 2017 13:27:55 +0100 Subject: Bump version Change-Id: Ic5e39292c1dba08f40170a1da3d4e48700a6c652 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index aefa1e7..fec66b7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.8.0 +MODULE_VERSION = 5.8.1 -- cgit v1.2.1