diff options
Diffstat (limited to 'package/qt5/qt5connectivity')
2 files changed, 0 insertions, 97 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 - diff --git a/package/qt5/qt5connectivity/qt5connectivity-0002-the-poster-example-needs-no-widgets-but-it-needs-quick.patch b/package/qt5/qt5connectivity/qt5connectivity-0002-the-poster-example-needs-no-widgets-but-it-needs-quick.patch deleted file mode 100644 index d8b75f44ea..0000000000 --- a/package/qt5/qt5connectivity/qt5connectivity-0002-the-poster-example-needs-no-widgets-but-it-needs-quick.patch +++ /dev/null @@ -1,67 +0,0 @@ -qt5connectivity: the poster example needs no widgets, but it needs quick -Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> - -From 0156038682cc40d44fedfc28dc9b78d1a0e6203b Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> -Date: Tue, 18 Feb 2014 15:28:48 +0100 -Subject: [PATCH] the poster example needs no widgets, but it needs quick - -Task-number: QTBUG-36893 -Change-Id: Ic77fe07aa450001386be0b2e0d4a99f2e674dbb2 -Reviewed-by: Alex Blasche <alexander.blasche@digia.com> -Reviewed-by: Rolf Eike Beer <eb@emlix.com> ---- - examples/nfc/nfc.pro | 5 ++++- - examples/nfc/poster/poster.pro | 2 +- - examples/nfc/poster/qmlposter.cpp | 4 ++-- - 3 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/examples/nfc/nfc.pro b/examples/nfc/nfc.pro -index e4f7e35..0076a71 100644 ---- a/examples/nfc/nfc.pro -+++ b/examples/nfc/nfc.pro -@@ -2,7 +2,10 @@ TEMPLATE = subdirs - qtHaveModule(widgets) { - SUBDIRS += \ - annotatedurl \ -- ndefeditor \ -+ ndefeditor -+} -+qtHaveModule(quick) { -+ SUBDIRS += \ - poster - } - -diff --git a/examples/nfc/poster/poster.pro b/examples/nfc/poster/poster.pro -index 47de298..b6e87ed 100644 ---- a/examples/nfc/poster/poster.pro -+++ b/examples/nfc/poster/poster.pro -@@ -1,4 +1,4 @@ --QT += qml quick network nfc widgets -+QT += qml quick network nfc - - SOURCES += \ - qmlposter.cpp -diff --git a/examples/nfc/poster/qmlposter.cpp b/examples/nfc/poster/qmlposter.cpp -index 89f3695..2fc943d 100644 ---- a/examples/nfc/poster/qmlposter.cpp -+++ b/examples/nfc/poster/qmlposter.cpp -@@ -38,13 +38,13 @@ - ** - ****************************************************************************/ - --#include <QtWidgets/QApplication> -+#include <QtGui/QGuiApplication> - #include <QtQml/QQmlEngine> - #include <QtQuick/QQuickView> - - int main(int argc, char *argv[]) - { -- QApplication application(argc, argv); -+ QGuiApplication application(argc, argv); - const QString mainQmlApp = QLatin1String("qrc:/poster.qml"); - QQuickView view; - view.setSource(QUrl(mainQmlApp)); --- -1.7.1 - |
