From: Peter Seiderer Date: Sat, 25 Nov 2017 21:54:25 +0000 (+0100) Subject: qt5quickcontrols2: fix examples compile without Qt widgets module X-Git-Tag: 2018.02-rc1~796 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/coffee/buildroot.git/commitdiff_plain/573a4a0bc8b14291255e06ac709566220fd3cdf9 qt5quickcontrols2: fix examples compile without Qt widgets module Add upstream suggested patch to fix flatstyle example configure (needs widgets module). Fixes: cd flatstyle/ && ( test -e Makefile || .../host/bin/qmake -o Makefile .../build/qt5quickcontrols2-5.9.2/examples/quickcontrols2/flatstyle/flatstyle.pro ) && make -f Makefile Project ERROR: Unknown module(s) in QT: widgets make[1]: *** [Makefile:202: sub-flatstyle-make_first] Error 3 make[1]: Leaving directory '.../build/qt5quickcontrols2-5.9.2/examples/quickcontrols2' make: *** [Makefile:45: sub-quickcontrols2-make_first] Error 2 Signed-off-by: Peter Seiderer [Thomas: move patch to 5.9.3 directory, since we've bumped qtquickcontrols2 since then.] Signed-off-by: Thomas Petazzoni --- diff --git a/package/qt5/qt5quickcontrols2/5.9.3/0001-Example-flatstyle-needs-widgets-module.patch b/package/qt5/qt5quickcontrols2/5.9.3/0001-Example-flatstyle-needs-widgets-module.patch new file mode 100644 index 0000000000..17e3b3610e --- /dev/null +++ b/package/qt5/qt5quickcontrols2/5.9.3/0001-Example-flatstyle-needs-widgets-module.patch @@ -0,0 +1,31 @@ +From 10d92524cd6736c767c9ce55a1d9b9f1a2a69a9f Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 25 Nov 2017 22:26:58 +0100 +Subject: [PATCH] Example flatstyle needs widgets module + +Fixes compile with disabled widgets module. + +Task-number: QTBUG-64761 +Change-Id: I743884d77d51e89061d87cab006bab0cafc9ddb7 + +Upstream: https://codereview.qt-project.org/212583 +Signed-off-by: Peter Seiderer +--- + examples/quickcontrols2/quickcontrols2.pro | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/examples/quickcontrols2/quickcontrols2.pro b/examples/quickcontrols2/quickcontrols2.pro +index 858759f..8310e9b 100644 +--- a/examples/quickcontrols2/quickcontrols2.pro ++++ b/examples/quickcontrols2/quickcontrols2.pro +@@ -6,5 +6,6 @@ SUBDIRS += \ + contactlist \ + sidepanel \ + swipetoremove \ +- flatstyle \ + wearable ++ ++qtHaveModule(widgets): SUBDIRS += flatstyle +-- +2.7.4 +