diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:14 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:14 +0100 |
| commit | d369cf01b5617961c2d0c9db7a7be6c25b42954a (patch) | |
| tree | bcd31b4ca0edc5c554483f88cc0e9d5dc16e934a /tests | |
| parent | 9485871222fb3c8f5f2d058ae8c5c0ca13b0ce2c (diff) | |
| parent | b17c07dc0b947c979372fbaf558ce9acc07d1837 (diff) | |
| download | qtlocation-d369cf01b5617961c2d0c9db7a7be6c25b42954a.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I8d0881209c8b0a0dce4ed949ef89ee2679448420
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/applications/positioning_backend/main.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qgeorectangle/tst_qgeorectangle.cpp | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/applications/positioning_backend/main.cpp b/tests/applications/positioning_backend/main.cpp index 52115556..2ed69cb6 100644 --- a/tests/applications/positioning_backend/main.cpp +++ b/tests/applications/positioning_backend/main.cpp @@ -31,8 +31,11 @@ #include <QApplication> #include <QtWidgets> +#include <QLoggingCategory> + int main(int argc, char *argv[]) { + //QLoggingCategory::setFilterRules("qt.positioning.*=true"); QApplication a(argc, argv); LogWidget *log = new LogWidget; diff --git a/tests/auto/qgeorectangle/tst_qgeorectangle.cpp b/tests/auto/qgeorectangle/tst_qgeorectangle.cpp index 01f0104b..219e8dfd 100644 --- a/tests/auto/qgeorectangle/tst_qgeorectangle.cpp +++ b/tests/auto/qgeorectangle/tst_qgeorectangle.cpp @@ -2080,6 +2080,14 @@ void tst_QGeoRectangle::unite_data() << QGeoRectangle(QGeoCoordinate(30.0, -180.0), QGeoCoordinate(-30.0, 180.0)); + QTest::newRow("wrapping and one containing other") + << QGeoRectangle(QGeoCoordinate(30.0, 40.0), + QGeoCoordinate(-30.0, -40.0)) + << QGeoRectangle(QGeoCoordinate(30.0, 160.0), + QGeoCoordinate(-30.0, 170.0)) + << QGeoRectangle(QGeoCoordinate(30.0, 40.0), + QGeoCoordinate(-30.0, -40.0)); + QTest::newRow("small gap over zero line") << QGeoRectangle(QGeoCoordinate(30.0, -20.0), QGeoCoordinate(-30.0, -10.0)) |