Merge remote-tracking branch 'origin/api_changes'

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/gui/kernel/qguiapplication.h
	src/gui/kernel/qwindow.cpp
	src/gui/kernel/qwindow.h
	tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp

Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e

1 files changed, 1 insertions, 21 deletions

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 5e24ffebd1..7ccc5e500e 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -103,7 +103,7 @@ namespace {
 struct CoreTypesFilter {
     template<typename T>
     struct Acceptor {
-        static const bool IsAccepted = QTypeModuleInfo<T>::IsCore && QtMetaTypePrivate::TypeDefinition<T>::IsAvailable;
+        static const bool IsAccepted = QModulesPrivate::QTypeModuleInfo<T>::IsCore && QtMetaTypePrivate::TypeDefinition<T>::IsAvailable;
     };
 };
 } // annonymous
@@ -1353,19 +1353,6 @@ QVariant::QVariant(const char *val)
   Constructs a new variant with the regular expression value \a re.
 */
 
-/*! \since 4.2
-  \fn QVariant::QVariant(Qt::GlobalColor color)
-
-  Constructs a new variant of type QVariant::Color and initializes
-  it with \a color.
-
-  This is a convenience constructor that allows \c{QVariant(Qt::blue);}
-  to create a valid QVariant storing a QColor.
-
-  Note: This constructor will assert if the application does not link
-  to the Qt GUI library.
- */
-
 QVariant::QVariant(Type type)
 { create(type, 0); }
 QVariant::QVariant(int typeId, const void *copy)
@@ -1447,7 +1434,6 @@ QVariant::QVariant(const QRegExp &regExp) { d.is_null = false; d.type = RegExp;
 QVariant::QVariant(const QRegularExpression &re) { d.is_null = false; d.type = QMetaType::QRegularExpression; v_construct<QRegularExpression>(&d, re); }
 #endif // QT_BOOTSTRAPPED
 #endif // QT_NO_REGEXP
-QVariant::QVariant(Qt::GlobalColor color) { create(62, &color); }
 
 /*!
     Returns the storage type of the value stored in the variant.
@@ -1586,9 +1572,6 @@ void QVariant::clear()
 */
 const char *QVariant::typeToName(int typeId)
 {
-    if (typeId == Invalid)
-        return 0;
-
     return QMetaType::typeName(typeId);
 }
 
@@ -1602,9 +1585,6 @@ const char *QVariant::typeToName(int typeId)
 */
 QVariant::Type QVariant::nameToType(const char *name)
 {
-    if (!name || !*name)
-        return Invalid;
-
     int metaType = QMetaType::type(name);
     return metaType <= int(UserType) ? QVariant::Type(metaType) : UserType;
 }