diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 07:47:32 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 06:48:58 +0000 |
| commit | 26f91fcec40d1bd50febb6ca6853489115f58a3b (patch) | |
| tree | 2f6265e26fa9482746e0efb32ef2f693b0d21cff /tests | |
| parent | e79664336f35f55a0241fdc0a45c7f15911e4da5 (diff) | |
| parent | 4a6807bca5f4452ea7a9d6ed2ff19b8e4259a372 (diff) | |
| download | qtlocation-26f91fcec40d1bd50febb6ca6853489115f58a3b.tar.gz | |
Merge remote-tracking branch 'gerrit/5.4' into dev
Change-Id: I5ef7649f02455269a8e2caa2f2d2241503586be3
Diffstat (limited to 'tests')
5 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/geotestplugin/geotestplugin.pro b/tests/auto/geotestplugin/geotestplugin.pro index 4b50989f..0945e4fe 100644 --- a/tests/auto/geotestplugin/geotestplugin.pro +++ b/tests/auto/geotestplugin/geotestplugin.pro @@ -20,3 +20,4 @@ OTHER_FILES += \ geotestplugin.json \ place_data.json DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +RESOURCES += testdata.qrc diff --git a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h index 07a6081c..61984ddc 100644 --- a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h @@ -251,6 +251,7 @@ public: protected: void timerEvent(QTimerEvent *event) { + Q_UNUSED(event); Q_ASSERT(timerId_ == event->timerId()); Q_ASSERT(geocodeReply_); killTimer(timerId_); diff --git a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h index 5974bfa7..841e9b82 100644 --- a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h @@ -167,6 +167,7 @@ public Q_SLOTS: protected: void timerEvent(QTimerEvent *event) { + Q_UNUSED(event); Q_ASSERT(timerId_ == event->timerId()); Q_ASSERT(routeReply_); killTimer(timerId_); diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h index e6a09da9..856e2de2 100644 --- a/tests/auto/geotestplugin/qplacemanagerengine_test.h +++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h @@ -206,6 +206,7 @@ public: m_locales << QLocale(); if (parameters.value(QStringLiteral("initializePlaceData"), false).toBool()) { QFile placeData(QFINDTESTDATA("place_data.json")); + QVERIFY(placeData.exists()); if (placeData.open(QIODevice::ReadOnly)) { QJsonDocument document = QJsonDocument::fromJson(placeData.readAll()); diff --git a/tests/auto/geotestplugin/testdata.qrc b/tests/auto/geotestplugin/testdata.qrc new file mode 100644 index 00000000..23eed23e --- /dev/null +++ b/tests/auto/geotestplugin/testdata.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>place_data.json</file> + </qresource> +</RCC> |