diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 12:47:51 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-18 12:34:25 +0000 |
| commit | e0a55c24f6637b58f0a517e3d7fc092249d5d987 (patch) | |
| tree | cdb463862b935ab3e42f18f8fbaf7338cf9c15ba /recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |
| parent | d6f5b4a96a93c1aaed64bb25e7b6de2f4c07529e (diff) | |
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
* use the same SRCREV and patches for nativesdk-qtbase like other
qtbase recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index a8fe4338..62feb778 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 85da054ff867fbf1a4c10e3f1cad782123ffdfe4 Mon Sep 17 00:00:00 2001 +From a77e7c2996ca25cc59b04b165a24575440dd7efa Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -30,7 +30,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 08b49a8d12..5876721743 100755 +index 08b49a8..5876721 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi @@ -43,7 +43,7 @@ index 08b49a8d12..5876721743 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 934a18a924..0f5b1b6333 100644 +index 934a18a..0f5b1b6 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { @@ -64,7 +64,7 @@ index 934a18a924..0f5b1b6333 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index c00fdb73f8..0cf4de7b49 100644 +index 1903e50..c093dd4 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -78,7 +78,7 @@ index c00fdb73f8..0cf4de7b49 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..c1837e6d55 +index 0000000..c1837e6 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,43 @@ @@ -127,7 +127,7 @@ index 0000000000..c1837e6d55 +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000000..5d22fb4101 +index 0000000..5d22fb4 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@ |