From 85e050b0b3f1eb36007abd6b12158ce3496a4dc4 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Mon, 27 Feb 2012 22:06:54 +0100
Subject: Make qlocale.h not depend on qvariant.h.

As a consequence, we have to add more explicit includes.

Change-Id: Ib3137031f0554b846c7bbd08f1f7df10dfeb8e61
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/corelib/io/qstandardpaths_unix.cpp | 1 +
 src/corelib/json/qjsonarray.cpp        | 1 +
 src/corelib/json/qjsondocument.cpp     | 1 +
 src/corelib/json/qjsonobject.cpp       | 1 +
 src/corelib/tools/qlocale.h            | 1 -
 src/corelib/tools/qlocale_p.h          | 2 +-
 6 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp
index 62c846738e..5499751751 100644
--- a/src/corelib/io/qstandardpaths_unix.cpp
+++ b/src/corelib/io/qstandardpaths_unix.cpp
@@ -42,6 +42,7 @@
 #include "qstandardpaths.h"
 #include <qdir.h>
 #include <qfile.h>
+#include <qhash.h>
 #include <qtextstream.h>
 #include <qcoreapplication.h>
 #include <private/qfilesystemengine_p.h>
diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp
index 0eb1974147..6ffb9639f7 100644
--- a/src/corelib/json/qjsonarray.cpp
+++ b/src/corelib/json/qjsonarray.cpp
@@ -44,6 +44,7 @@
 #include <qjsonarray.h>
 #include <qjsonvalue.h>
 #include <qstringlist.h>
+#include <qvariant.h>
 #include <qdebug.h>
 
 #include "qjsonwriter_p.h"
diff --git a/src/corelib/json/qjsondocument.cpp b/src/corelib/json/qjsondocument.cpp
index 8a7fa760ae..c2204bf696 100644
--- a/src/corelib/json/qjsondocument.cpp
+++ b/src/corelib/json/qjsondocument.cpp
@@ -44,6 +44,7 @@
 #include <qjsonvalue.h>
 #include <qjsonarray.h>
 #include <qstringlist.h>
+#include <qvariant.h>
 #include <qdebug.h>
 #include "qjsonwriter_p.h"
 #include "qjsonparser_p.h"
diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp
index b7af8c22cf..289a752c8b 100644
--- a/src/corelib/json/qjsonobject.cpp
+++ b/src/corelib/json/qjsonobject.cpp
@@ -44,6 +44,7 @@
 #include <qjsonarray.h>
 #include <qstringlist.h>
 #include <qdebug.h>
+#include <qvariant.h>
 #include "qjson_p.h"
 #include "qjsonwriter_p.h"
 
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index c029f627b2..2ecd934100 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -42,7 +42,6 @@
 #ifndef QLOCALE_H
 #define QLOCALE_H
 
-#include <QtCore/qvariant.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qobjectdefs.h>
 
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h
index c6902ca206..ad7c9706c4 100644
--- a/src/corelib/tools/qlocale_p.h
+++ b/src/corelib/tools/qlocale_p.h
@@ -55,7 +55,7 @@
 
 #include "QtCore/qstring.h"
 #include "QtCore/qvarlengtharray.h"
-#include "QtCore/qmetatype.h"
+#include "QtCore/qvariant.h"
 
 #include "qlocale.h"
 
-- 
cgit v1.2.3