diff options
-rw-r--r-- | dependencies.yaml | 6 | ||||
-rw-r--r-- | src/bluetooth/bluez/agent_p.h | 3 | ||||
-rw-r--r-- | src/bluetooth/bluez/obex_agent_p.h | 3 | ||||
-rw-r--r-- | src/imports/nfc/qdeclarativendeffilter.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 2f95ace7..551977a5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtandroidextras: - ref: 66eb93deb8ae64ab5bdadc240fd3a7a7fb12190a + ref: b050dc3ff5243fd0516385d91f96c77170981795 required: false ../qtbase: - ref: 7b3bdcbfe8a920c4c156e91324eb0b374533d42c + ref: d273076b4474bb473d90e996960c4c773745761a required: true ../qtdeclarative: - ref: c7e67202d5e720f0b085d7f71477fd1c96fb7304 + ref: 893100fba3f3a2e4d4ffe108202fdac67a3d4357 required: false diff --git a/src/bluetooth/bluez/agent_p.h b/src/bluetooth/bluez/agent_p.h index 32efa62e..7ca177fd 100644 --- a/src/bluetooth/bluez/agent_p.h +++ b/src/bluetooth/bluez/agent_p.h @@ -13,11 +13,10 @@ #define AGENT_P_H #include <QtCore/QObject> +#include <QtCore/qcontainerfwd.h> #include <QtDBus/QtDBus> QT_BEGIN_NAMESPACE class QByteArray; -template<class T> class QList; -template<class Key, class Value> class QMap; class QString; class QStringList; class QVariant; diff --git a/src/bluetooth/bluez/obex_agent_p.h b/src/bluetooth/bluez/obex_agent_p.h index 242b2598..b370810d 100644 --- a/src/bluetooth/bluez/obex_agent_p.h +++ b/src/bluetooth/bluez/obex_agent_p.h @@ -13,11 +13,10 @@ #define OBEX_AGENT_P_H #include <QtCore/QObject> +#include <QtCore/qcontainerfwd.h> #include <QtDBus/QtDBus> QT_BEGIN_NAMESPACE class QByteArray; -template<class T> class QList; -template<class Key, class Value> class QMap; class QString; class QStringList; class QVariant; diff --git a/src/imports/nfc/qdeclarativendeffilter.cpp b/src/imports/nfc/qdeclarativendeffilter.cpp index c382ccd9..96cf4f3a 100644 --- a/src/imports/nfc/qdeclarativendeffilter.cpp +++ b/src/imports/nfc/qdeclarativendeffilter.cpp @@ -39,6 +39,8 @@ #include "qdeclarativendeffilter_p.h" +#include <limits.h> + /*! \qmltype NdefFilter \instantiates QDeclarativeNdefFilter |