diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2012-10-01 13:28:16 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-01 12:04:55 +0200 |
| commit | f3d8f66116af4319650d8f3e7ca069275fdfa780 (patch) | |
| tree | 2b7dc73c029adfdf0302409a2422b3df4d9e5c54 /examples/nfc | |
| parent | 3f4a920f87842e1bbb20f72ce04d6da7a866ab1d (diff) | |
Further porting of NFC module from mobility to Qt 5.
Includes the following changes:
* Conditionally enables building of the NFC module when qmake is
run with CONFIG+=nfc.
* Correctly build within the QtNfc namespace.
* Fix compile errors in examples, enable building of NFC examples.
* Fix compile errors in tests, enable building of NFC tests.
Mark the some NFC tests as insignificant as they currently crash.
Notably does not enable NFC documentation generation.
Task-number: QTBUG-22015
Change-Id: I9ff170c45848c8f0215e9427797922f840c2f015
Reviewed-by: Alex <ablasche@gmail.com>
Diffstat (limited to 'examples/nfc')
| -rw-r--r-- | examples/nfc/nfc.pro | 7 | ||||
| -rw-r--r-- | examples/nfc/poster/poster.pro | 2 | ||||
| -rw-r--r-- | examples/nfc/poster/qmlposter.cpp | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/examples/nfc/nfc.pro b/examples/nfc/nfc.pro new file mode 100644 index 00000000..d219924c --- /dev/null +++ b/examples/nfc/nfc.pro @@ -0,0 +1,7 @@ +TEMPLATE = subdirs +!contains(QT_CONFIG, no-widgets) { + SUBDIRS += \ + annotatedurl \ + ndefeditor \ + poster +} diff --git a/examples/nfc/poster/poster.pro b/examples/nfc/poster/poster.pro index de2e1a05..d108b2a2 100644 --- a/examples/nfc/poster/poster.pro +++ b/examples/nfc/poster/poster.pro @@ -1,4 +1,4 @@ -QT += declarative quick network nfc widgets +QT += qml quick network nfc widgets SOURCES += \ qmlposter.cpp diff --git a/examples/nfc/poster/qmlposter.cpp b/examples/nfc/poster/qmlposter.cpp index 606a96f8..cb75c2a1 100644 --- a/examples/nfc/poster/qmlposter.cpp +++ b/examples/nfc/poster/qmlposter.cpp @@ -39,8 +39,8 @@ ****************************************************************************/ #include <QtWidgets/QApplication> +#include <QtQml/QQmlEngine> #include <QtQuick/QQuickView> -#include <QtDeclarative/QDeclarativeEngine> int main(int argc, char *argv[]) { |