diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
| commit | 27a5414804f7b8ab41101aad219ebef02d364bde (patch) | |
| tree | c9535dfed260314855b3ba1fe2c75652fdf60a1a /package/qt5/qt5connectivity/qt5connectivity-0001-don_t-build-scanner-example-without-qtquick.patch | |
| parent | f6162290fb6800fecffb86eed42069aa0f813f87 (diff) | |
| parent | fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff) | |
| download | buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.tar.gz buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.zip | |
Merge branch 'next'
Conflicts:
package/gdb/Config.in.host
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5connectivity/qt5connectivity-0001-don_t-build-scanner-example-without-qtquick.patch')
| -rw-r--r-- | package/qt5/qt5connectivity/qt5connectivity-0001-don_t-build-scanner-example-without-qtquick.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/package/qt5/qt5connectivity/qt5connectivity-0001-don_t-build-scanner-example-without-qtquick.patch b/package/qt5/qt5connectivity/qt5connectivity-0001-don_t-build-scanner-example-without-qtquick.patch deleted file mode 100644 index 0751ba7d9f..0000000000 --- a/package/qt5/qt5connectivity/qt5connectivity-0001-don_t-build-scanner-example-without-qtquick.patch +++ /dev/null @@ -1,30 +0,0 @@ -qt5connectivity: Don't build scanner example without QtQuick -Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> - -From 1454664752505f5870e4173d15362bfdfe4148e7 Mon Sep 17 00:00:00 2001 -From: Alex Blasche <alexander.blasche@digia.com> -Date: Wed, 15 Jan 2014 12:11:31 +0100 -Subject: [PATCH] Don't build scanner example without QtQuick - -Task-number: QTBUG-35711 -Change-Id: I0406fb5edd8fb2a90046308853485eaaa4311a26 -Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> -Reviewed-by: Fabian Bumberger <fbumberger@rim.com> -Reviewed-by: Alex Blasche <alexander.blasche@digia.com> ---- - examples/bluetooth/bluetooth.pro | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/examples/bluetooth/bluetooth.pro b/examples/bluetooth/bluetooth.pro -index e3ef769..549bb7c 100644 ---- a/examples/bluetooth/bluetooth.pro -+++ b/examples/bluetooth/bluetooth.pro -@@ -6,4 +6,4 @@ qtHaveModule(widgets) { - bttennis - } - --SUBDIRS += scanner -+qtHaveModule(quick): SUBDIRS += scanner --- -1.7.1 - |
