From 31590c0b65d90c02586527c658d71e83d6d98843 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 2 May 2018 12:20:19 +0200 Subject: set QTDIR_build in .qmake.super this suppresses license checking in default_pre.prf in the super module. submodules set it via their .qmake.conf's. Change-Id: Ic3599613140169eeacb48385be8f324c4bef8f1a Reviewed-by: Joerg Bornemann --- qt.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index af16c6df..9ce0a694 100644 --- a/qt.pro +++ b/qt.pro @@ -1,5 +1,7 @@ # Create the super cache so modules will add themselves to it. -cache(, super) +# Also suppress the license check on subsequent "visits". The first +# visit will skip it anyway due to not having a compiler set up yet. +cache(CONFIG, add super, $$list(QTDIR_build)) TEMPLATE = subdirs -- cgit v1.2.1 From 8a559f20e3c40fcc5ecbba4e76669b242e9002b0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 18 Aug 2018 04:30:59 +0000 Subject: Update submodules on '5.11' in qt5 Change-Id: Id6f78adf7c0c3f455b798ad1bc80c7097b519e0b Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index ccfe440c..295b16da 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ccfe440c34479377363679fc890f10b44ee57769 +Subproject commit 295b16da9289bdd261665006b1e5a2284196cb7e diff --git a/qtbase b/qtbase index 29778037..981b16d9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 29778037f8a7b2c86bc4044409b37d5a51a15432 +Subproject commit 981b16d9ba5a4bb7c6fdc0009fda9a4a74a92f9a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index bf39468a..d8906c5f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit bf39468a6368b055335c6b73da65577ec55731ee +Subproject commit d8906c5f36540baef2886e5c6f5b7b4199525f5c diff --git a/qtwayland b/qtwayland index b5dfc03a..334822b7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b5dfc03a13014bf29d23784bc6802bb06e212558 +Subproject commit 334822b742cb15bb27dbc14b45d41e2714eef767 -- cgit v1.2.1 From 79c3ea18ed0effc686a0972767dc56a6084accbb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Aug 2018 04:31:26 +0000 Subject: Update submodules on '5.11' in qt5 Change-Id: I3b4d492fcaca7b1519fea144a944aefda68299ef Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 981b16d9..2d3098f7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 981b16d9ba5a4bb7c6fdc0009fda9a4a74a92f9a +Subproject commit 2d3098f77c98a895dad2c2e6c1c3facf712473f5 -- cgit v1.2.1 From f35a0cb742da34516abda0e5d85f8b41ff4ce4ed Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Aug 2018 04:31:12 +0000 Subject: Update submodules on '5.11' in qt5 Change-Id: I4195ceeeefeb98c8d600b86079f986d2d18e6884 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 295b16da..d0692c69 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 295b16da9289bdd261665006b1e5a2284196cb7e +Subproject commit d0692c6944599a5561ea07faaa6bddf98e7e2a6e diff --git a/qtbase b/qtbase index 2d3098f7..76c328b2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2d3098f77c98a895dad2c2e6c1c3facf712473f5 +Subproject commit 76c328b2b39617310993ce76e65665943b8c111c diff --git a/qtconnectivity b/qtconnectivity index 72a48c7d..0c2b6dc4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 72a48c7d108e1f3faaab0a03c6d2a6ead16d2bcc +Subproject commit 0c2b6dc44351352e8a88248b98e1d45c0403e01c diff --git a/qtdeclarative b/qtdeclarative index b5016550..7c4335d0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b50165508996e10a232ee70196a820da06f1af1c +Subproject commit 7c4335d0307abde6dd17738481d006d70771714c diff --git a/qtrepotools b/qtrepotools index 24801f60..ded95025 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 24801f60f05f013f728654d06b35616eec2ef089 +Subproject commit ded9502576543d83ba157eca42515ccd656b25fb diff --git a/qtwebchannel b/qtwebchannel index 1906f624..b4277bf9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1906f62469e608f712c1507dabd74638e38d8075 +Subproject commit b4277bf9bf30f1fc8cba1d6c7185e991e83e6e18 diff --git a/qtwebengine b/qtwebengine index e56dd7e3..dab4814d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e56dd7e37ea96c4ba1354e319bdaa9d01c401747 +Subproject commit dab4814dc4187db345a53b234c4cdd4cbdcf4bce -- cgit v1.2.1 From c3e5f325bb957280e9443e49c45533a42a4666c7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Aug 2018 23:30:43 +0200 Subject: Update submodules on '5.11' in qt5 Change-Id: I4f4c59dc396299e2c6a398521174e91cc7cac2ec Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtmultimedia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 76c328b2..02b3d43f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 76c328b2b39617310993ce76e65665943b8c111c +Subproject commit 02b3d43fd4661271e6e8dc8940d84cb2ba352fe0 diff --git a/qtmultimedia b/qtmultimedia index b799d36a..c1ca9510 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b799d36a9e543bccd921399e929ef7ad17f15497 +Subproject commit c1ca9510af3c3c4134b717f1863651783e338a9e -- cgit v1.2.1 From c620015aacb1b804a4a3128d9405d534a068ddac Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 23 Aug 2018 23:30:43 +0200 Subject: Update submodules on '5.11' in qt5 Change-Id: Icfc06ccf7128083957edc4478cd810cbb259186c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtvirtualkeyboard | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 02b3d43f..dc7e775c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 02b3d43fd4661271e6e8dc8940d84cb2ba352fe0 +Subproject commit dc7e775c9c6ecc66f76af8139b8dfc3ee101c7ff diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d8906c5f..c4079ef5 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d8906c5f36540baef2886e5c6f5b7b4199525f5c +Subproject commit c4079ef585f3efdedc64d961d8ef2bd90cedb7fc -- cgit v1.2.1