diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-04 10:20:19 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-08 06:27:24 +0000 |
| commit | 44538bd408cc7d82b858146b759024f5e38e64cc (patch) | |
| tree | 380aeaab5e6f246501496f40fa2d1573bff80e85 /recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | |
| parent | 94d666a06730b93f16a4bd9ad8d5509d974e146c (diff) | |
| download | meta-qt5-44538bd408cc7d82b858146b759024f5e38e64cc.tar.gz | |
Upgrade to Qt 5.12.0
Change-Id: I83beaa146a88bf6138e11c87a3308db38d9afd34
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch')
| -rw-r--r-- | recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 88363219..1f871bb0 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 15ba3204df65645f604a23f71f819a392ff1e4b7 Mon Sep 17 00:00:00 2001 | 1 | From da05164543625a93f3a646967d4692bcf13f441f Mon Sep 17 00:00:00 2001 |
| 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> |
| 3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 | 3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 |
| 4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
| @@ -10,12 +10,12 @@ Subject: [PATCH] Allow a tools-only build | |||
| 10 | 3 files changed, 8 insertions(+), 3 deletions(-) | 10 | 3 files changed, 8 insertions(+), 3 deletions(-) |
| 11 | 11 | ||
| 12 | diff --git a/qt3d.pro b/qt3d.pro | 12 | diff --git a/qt3d.pro b/qt3d.pro |
| 13 | index 2cc347a1c..81cdeefb0 100644 | 13 | index 6f759b293..5f07c7c4e 100644 |
| 14 | --- a/qt3d.pro | 14 | --- a/qt3d.pro |
| 15 | +++ b/qt3d.pro | 15 | +++ b/qt3d.pro |
| 16 | @@ -1,4 +1,4 @@ | 16 | @@ -1,4 +1,4 @@ |
| 17 | -requires(qtConfig(opengl)) | 17 | -requires(qtConfig(opengl):!html5) |
| 18 | +!tools-only:requires(qtConfig(opengl)) | 18 | +!tools-only:requires(qtConfig(opengl):!html5) |
| 19 | 19 | ||
| 20 | CONFIG += examples_need_tools | 20 | CONFIG += examples_need_tools |
| 21 | load(qt_parts) | 21 | load(qt_parts) |