diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch deleted file mode 100644 index d8d88c2cfc..0000000000 --- a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
1 | From de2b568a4f14f38ae26960f543277bd2ac57c9d6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex <qt-info@nokia.com> | ||
3 | Date: Tue, 10 May 2011 14:54:49 +1000 | ||
4 | Subject: [PATCH] fix !embedded usage (doesn't work outside of Qt) | ||
5 | |||
6 | embedded is part of QT_CONFIG and not CONFIG | ||
7 | |||
8 | Task-number: QTMOBILITY-1586 | ||
9 | --- | ||
10 | Upstream-Status: Backport | ||
11 | https://qt.gitorious.org/qt-mobility/qt-mobility/commit/de2b568a4f14f38ae26960f543277bd2ac57c9d6 | ||
12 | EB: refreshed the patch for it to apply properly | ||
13 | |||
14 | plugins/multimedia/gstreamer/gstreamer.pro | 2 +- | ||
15 | src/systeminfo/systeminfo.pro | 6 +++--- | ||
16 | tests/auto/auto.pro | 2 +- | ||
17 | 3 files changed, 5 insertions(+), 5 deletions(-) | ||
18 | |||
19 | Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro | ||
20 | =================================================================== | ||
21 | --- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:34:40.880862884 +0200 | ||
22 | +++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:35:22.844862550 +0200 | ||
23 | @@ -85,7 +85,7 @@ | ||
24 | qgstutils.cpp | ||
25 | |||
26 | |||
27 | -!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) { | ||
28 | +!win32:!contains(QT_CONFIG,embedded):!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) { | ||
29 | LIBS += -lXv -lX11 -lXext | ||
30 | |||
31 | HEADERS += \ | ||
32 | Index: qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro | ||
33 | =================================================================== | ||
34 | --- qt-mobility-opensource-src-1.2.0.orig/src/systeminfo/systeminfo.pro 2013-09-19 10:34:40.884862884 +0200 | ||
35 | +++ qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro 2013-09-19 10:36:05.480862210 +0200 | ||
36 | @@ -101,7 +101,7 @@ | ||
37 | LIBS += -lblkid | ||
38 | } | ||
39 | |||
40 | - !embedded:!contains(QT_CONFIG,qpa): { | ||
41 | + !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): { | ||
42 | LIBS += -lX11 -lXrandr | ||
43 | } | ||
44 | |||
45 | @@ -154,7 +154,7 @@ | ||
46 | #for now... udisks | ||
47 | } else { | ||
48 | DEFINES += QT_NO_UDISKS | ||
49 | - !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr | ||
50 | + !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr | ||
51 | } | ||
52 | |||
53 | contains(connman_enabled, yes): { | ||
54 | @@ -165,7 +165,7 @@ | ||
55 | } | ||
56 | } else { | ||
57 | DEFINES += QT_NO_NETWORKMANAGER QT_NO_UDISKS QT_NO_CONNMAN | ||
58 | - !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr | ||
59 | + !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr | ||
60 | } | ||
61 | } | ||
62 | |||
63 | Index: qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro | ||
64 | =================================================================== | ||
65 | --- qt-mobility-opensource-src-1.2.0.orig/tests/auto/auto.pro 2013-09-19 10:34:40.884862884 +0200 | ||
66 | +++ qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro 2013-09-19 10:35:22.844862550 +0200 | ||
67 | @@ -21,5 +21,5 @@ | ||
68 | # which require that the autotest is run on the same machine | ||
69 | # doing the build - i.e. cross-compilation is not allowed. | ||
70 | win32|mac|linux-g++* { | ||
71 | - !embedded:!maemo5:!maemo6:SUBDIRS+=host.pro | ||
72 | + !contains(QT_CONFIG,embedded):!maemo5:!maemo6:SUBDIRS+=host.pro | ||
73 | } | ||