git.libre-soc.org Git - buildroot.git/blob

   1 qt5connectivity: the poster example needs no widgets, but it needs quick
   2 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
   3
   4 From 0156038682cc40d44fedfc28dc9b78d1a0e6203b Mon Sep 17 00:00:00 2001
   5 From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
   6 Date: Tue, 18 Feb 2014 15:28:48 +0100
   7 Subject: [PATCH] the poster example needs no widgets, but it needs quick
   8
   9 Task-number: QTBUG-36893
  10 Change-Id: Ic77fe07aa450001386be0b2e0d4a99f2e674dbb2
  11 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
  12 Reviewed-by: Rolf Eike Beer <eb@emlix.com>
  13 ---
  14  examples/nfc/nfc.pro              |    5 ++++-
  15  examples/nfc/poster/poster.pro    |    2 +-
  16  examples/nfc/poster/qmlposter.cpp |    4 ++--
  17  3 files changed, 7 insertions(+), 4 deletions(-)
  18
  19 diff --git a/examples/nfc/nfc.pro b/examples/nfc/nfc.pro
  20 index e4f7e35..0076a71 100644
  21 --- a/examples/nfc/nfc.pro
  22 +++ b/examples/nfc/nfc.pro
  23 @@ -2,7 +2,10 @@ TEMPLATE = subdirs
  24  qtHaveModule(widgets) {
  25      SUBDIRS += \
  26          annotatedurl \
  27 -        ndefeditor \
  28 +        ndefeditor
  29 +}
  30 +qtHaveModule(quick) {
  31 +    SUBDIRS += \
  32          poster
  33  }
  34
  35 diff --git a/examples/nfc/poster/poster.pro b/examples/nfc/poster/poster.pro
  36 index 47de298..b6e87ed 100644
  37 --- a/examples/nfc/poster/poster.pro
  38 +++ b/examples/nfc/poster/poster.pro
  39 @@ -1,4 +1,4 @@
  40 -QT += qml quick network nfc widgets
  41 +QT += qml quick network nfc
  42
  43  SOURCES += \
  44      qmlposter.cpp
  45 diff --git a/examples/nfc/poster/qmlposter.cpp b/examples/nfc/poster/qmlposter.cpp
  46 index 89f3695..2fc943d 100644
  47 --- a/examples/nfc/poster/qmlposter.cpp
  48 +++ b/examples/nfc/poster/qmlposter.cpp
  49 @@ -38,13 +38,13 @@
  50  **
  51  ****************************************************************************/
  52
  53 -#include <QtWidgets/QApplication>
  54 +#include <QtGui/QGuiApplication>
  55  #include <QtQml/QQmlEngine>
  56  #include <QtQuick/QQuickView>
  57
  58  int main(int argc, char *argv[])
  59  {
  60 -    QApplication application(argc, argv);
  61 +    QGuiApplication application(argc, argv);
  62      const QString mainQmlApp = QLatin1String("qrc:/poster.qml");
  63      QQuickView view;
  64      view.setSource(QUrl(mainQmlApp));
  65 --
  66 1.7.1
  67