From 6e975829c17d15835d0567e00d3abb19774ef114 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@qt.io>
Date: Tue, 11 Apr 2017 11:22:29 +0200
Subject: [PATCH] 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>
---
src/location/maps/qgeoprojection.cpp | 1 +
src/positioning/qdoublematrix4x4.cpp | 1 +
src/positioning/qdoublematrix4x4_p.h | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/location/maps/qgeoprojection.cpp b/src/location/maps/qgeoprojection.cpp
index 4e5f1979b..5aaf584b5 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 76e1252b6..32cc7f1f9 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 d8f6b1f61..77b3e5b92 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
--
GitLab