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

@@ -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>

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"

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"

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"
 

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>
 

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"