diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-06-24 14:53:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-26 12:12:35 +0200 |
| commit | d4886e1a50fd546f8e059ef9c539932d6d58c96d (patch) | |
| tree | 341a8cba6b0bd5cedd8f30a0e52742e6a8742eda /src/src.pro | |
| parent | f2d6f3b6a6c5eebc36e0206c85896c1142f31229 (diff) | |
Enable Qt NFC in the CI system.
Don't require CONFIG+=nfc to build QtNfc lib.
This prevents proper test execution and there is no API commitment until
the API is offcially released anyway.
Excludes three auto tests from -developer-build builds
as they require Q_AUTOTEST_EXPORT.
Fixes compile errors associated to namespace'd builds of Qt.
Revert "Remove not needed symbol 'qHash(const QNdefRecord&)'"
The symbol is needed during compilation by Windows.
This reverts commit 39901af48f40f0672731a1f62dc003c4b37d1fec.
Change-Id: I61c644bbfc4906729e6d2b9deb741989030c8624
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/src.pro b/src/src.pro index 1f96b1f1..9f865e0a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,11 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered -# The Qt NFC module is currently not supported. The API is not finalized and may change. -# The Qt NFC module can be built by passing CONFIG+=nfc to qmake. -nfc { - message("Building unsupported Qt NFC module, API is not finalized and may change.") - SUBDIRS += nfc -} - -SUBDIRS += bluetooth imports +SUBDIRS += bluetooth nfc imports |