From 0399b825a1ff7470ed6fd272de8ba74e2be971c3 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 11 Jul 2019 11:23:06 +0200 Subject: Bump module version to 6.0.0 Change-Id: Icc1c7fd6aac680d7f4537678e64db2fa649800b5 Reviewed-by: Alexandru Croitor --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index c6f1702..8b97f9b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.14.0 +MODULE_VERSION = 6.0.0 -- cgit v1.2.1 From ccde32dd8ed91702fc7e58850cf462bcaf15390d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 20 Aug 2019 13:08:29 +0200 Subject: Re-add dependencies.yaml now that qt5.git wip/qt6 builds fine Change-Id: I959a72311aabc78b46d64998b8b1709889cf383f Reviewed-by: Aapo Keskimolo --- dependencies.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 dependencies.yaml diff --git a/dependencies.yaml b/dependencies.yaml new file mode 100644 index 0000000..0443eab --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,4 @@ +dependencies: + ../qtbase.git: + ref: 8811e96aac7537bae049860b90adf425042afb31 + required: true -- cgit v1.2.1 From fb7dcc7c49ab5e30af30a1d73510d7fa1871e2d1 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 28 Aug 2019 09:52:18 +0200 Subject: Revert "Re-add dependencies.yaml now that qt5.git wip/qt6 builds fine" This reverts commit ccde32dd8ed91702fc7e58850cf462bcaf15390d. As discussed we shouldn't use the files until we have an easier mechanism for updating in place. Change-Id: I942e0e28a08af639478d6d4287ef865ff9e2f240 Reviewed-by: Simon Hausmann --- dependencies.yaml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 dependencies.yaml diff --git a/dependencies.yaml b/dependencies.yaml deleted file mode 100644 index 0443eab..0000000 --- a/dependencies.yaml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: - ../qtbase.git: - ref: 8811e96aac7537bae049860b90adf425042afb31 - required: true -- cgit v1.2.1