diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2017-04-11 11:22:29 +0200 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-04-11 19:26:17 +0000 |
commit | 6e975829c17d15835d0567e00d3abb19774ef114 (patch) | |
tree | b9e8bc6c916c9b5c30c7c9362320d4a0406951d7 | |
parent | 57ca202484c996c15f7a3caabcfe9199cc75112e (diff) | |
download | qtlocation-6e975829c17d15835d0567e00d3abb19774ef114.tar.gz |
Remove QtGui dependency from QDoubleMatrix4x4
This fixes the -no-gui build.
Task-number: QTBUG-60062
Change-Id: I71400dfddac8ddf6a74906be8ba1272bf4a86781
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/location/maps/qgeoprojection.cpp | 1 | ||||
-rw-r--r-- | src/positioning/qdoublematrix4x4.cpp | 1 | ||||
-rw-r--r-- | src/positioning/qdoublematrix4x4_p.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/location/maps/qgeoprojection.cpp b/src/location/maps/qgeoprojection.cpp index 4e5f1979..5aaf584b 100644 --- a/src/location/maps/qgeoprojection.cpp +++ b/src/location/maps/qgeoprojection.cpp @@ -39,6 +39,7 @@ #include <QtPositioning/private/qlocationutils_p.h> #include <QtPositioning/private/qclipperutils_p.h> #include <QSize> +#include <QtGui/QMatrix4x4> #include <cmath> namespace { diff --git a/src/positioning/qdoublematrix4x4.cpp b/src/positioning/qdoublematrix4x4.cpp index 76e1252b..32cc7f1f 100644 --- a/src/positioning/qdoublematrix4x4.cpp +++ b/src/positioning/qdoublematrix4x4.cpp @@ -40,6 +40,7 @@ #include "qdoublematrix4x4_p.h" #include <QtCore/qmath.h> //#include <QtCore/qvariant.h> +#include <QtCore/qdatastream.h> #include <cmath> QT_BEGIN_NAMESPACE diff --git a/src/positioning/qdoublematrix4x4_p.h b/src/positioning/qdoublematrix4x4_p.h index d8f6b1f6..77b3e5b9 100644 --- a/src/positioning/qdoublematrix4x4_p.h +++ b/src/positioning/qdoublematrix4x4_p.h @@ -53,9 +53,9 @@ #include <QtPositioning/private/qpositioningglobal_p.h> #include <QtPositioning/private/qdoublevector3d_p.h> +#include <QtCore/QDebug> #include <QtCore/qmetatype.h> #include <QtCore/QRectF> -#include <QtGui/qmatrix4x4.h> QT_BEGIN_NAMESPACE |