diff options
author | Denys Dmytriyenko <denys@ti.com> | 2016-03-31 20:47:22 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-20 10:51:51 +0200 |
commit | 3af44d648aec077ba313079645be1465c0a8869b (patch) | |
tree | a047dcb2b9ae1e726a51e88840c66054a9149767 | |
parent | 4ec27e218d725677279d265ac1fc256443d665f7 (diff) | |
download | meta-qt5-3af44d648aec077ba313079645be1465c0a8869b.tar.gz |
qtdeclarative: fix compilation of examples/qquickviewcomparison
git/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp:180:14: error: 'QCoreApplication' has not been declared
if (!QCoreApplication::arguments().contains(QStringLiteral("--no_render_alpha")))
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch | 28 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch new file mode 100644 index 00000000..1687fbe5 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 1cdd3278a0b1508640d983720782d39eb919caaf Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Dmytriyenko <denys@ti.com> | ||
3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 | ||
4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been | ||
5 | declared error | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
10 | --- | ||
11 | examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | ||
15 | index 5b86c93..e77514e 100644 | ||
16 | --- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | ||
17 | +++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | ||
18 | @@ -44,6 +44,7 @@ | ||
19 | #include <QWidget> | ||
20 | #include <QQuickWidget> | ||
21 | #include <QQuickView> | ||
22 | +#include <QCoreApplication> | ||
23 | |||
24 | QT_FORWARD_DECLARE_CLASS(QRadioButton) | ||
25 | QT_FORWARD_DECLARE_CLASS(QCheckBox) | ||
26 | -- | ||
27 | 2.2.0 | ||
28 | |||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 93442fb4..9274d00d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -15,6 +15,7 @@ DEPENDS += "qtbase" | |||
15 | 15 | ||
16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
17 | file://0001-qmltestexample-fix-link.patch \ | 17 | file://0001-qmltestexample-fix-link.patch \ |
18 | file://0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" | 21 | EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" |