diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-02 14:39:52 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-03 10:01:14 +0200 |
| commit | af6cd54ed2b6d8834dbf09570dbe42460bd78b92 (patch) | |
| tree | cbb55ca0f320d53b82c69b1afe063b675a20147a /recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch | |
| parent | 2da972e58650f5d44f2cfd4fc1ec4e4dc1d2cd48 (diff) | |
| parent | f9a58d623762c5fd78bd6bc18d701a7aaa004567 (diff) | |
| download | meta-qt5-af6cd54ed2b6d8834dbf09570dbe42460bd78b92.tar.gz | |
Merge "Merge remote-tracking branch 'qt/upstream/master' into 5.14"
Diffstat (limited to 'recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch')
| -rw-r--r-- | recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch index 55c6e22a..06eec226 100644 --- a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch +++ b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 623675e07231f62cdc7600dca5897a9fc70e0467 Mon Sep 17 00:00:00 2001 | 1 | From ffbd58e5a6c709592fb97a6d033820556b76ab53 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 14 Dec 2019 18:36:49 -0800 | 3 | Date: Sat, 14 Dec 2019 18:36:49 -0800 |
| 4 | Subject: [PATCH] src.pro: Add option noqdoc to disable qdoc builds | 4 | Subject: [PATCH] src.pro: Add option noqdoc to disable qdoc builds |
| @@ -23,6 +23,3 @@ index 5c256ea3..196c34c7 100644 | |||
| 23 | 23 | ||
| 24 | !android|android_app: SUBDIRS += qtpaths | 24 | !android|android_app: SUBDIRS += qtpaths |
| 25 | 25 | ||
| 26 | -- | ||
| 27 | 2.24.1 | ||
| 28 | |||