Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7

diff --cc dist/changes-5.0.0
Simple merge

diff --cc qmake/Makefile.unix
Simple merge

diff --cc qmake/Makefile.win32
Simple merge

diff --cc qmake/Makefile.win32-g++
Simple merge

diff --cc qmake/qmake.pri
Simple merge

diff --cc src/corelib/kernel/qmetatype.cpp
Simple merge

diff --cc src/corelib/kernel/qmetatype.h
Simple merge

diff --cc src/corelib/kernel/qvariant.cpp
Simple merge

diff --cc src/printsupport/dialogs/qprintdialog.h
Simple merge

diff --cc src/testlib/qtestcase.cpp
Simple merge

diff --cc tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 84d28c7,bc5fa27..589b838
--- 1/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
--- 2/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@@ -331,8 -312,14 +329,15 @@@ void tst_QMetaType::typeName_data(
      QTest::addColumn<QString>("aTypeName");
  
      QT_FOR_EACH_STATIC_TYPE(TYPENAME_DATA)
-     QT_FOR_EACH_STATIC_ALIAS_TYPE(TYPENAME_DATA_ALIAS)
 +    QTest::newRow("QMetaType::UnknownType") << QMetaType::UnknownType << static_cast<const char*>(0);
+ 
+     QTest::newRow("Whity<double>") << static_cast<QMetaType::Type>(::qMetaTypeId<Whity<double> >()) << QString::fromLatin1("Whity<double>");
+     QTest::newRow("Whity<int>") << static_cast<QMetaType::Type>(::qMetaTypeId<Whity<int> >()) << QString::fromLatin1("Whity<int>");
+     QTest::newRow("Testspace::Foo") << static_cast<QMetaType::Type>(::qMetaTypeId<TestSpace::Foo>()) << QString::fromLatin1("TestSpace::Foo");
+ 
+     QTest::newRow("-1") << QMetaType::Type(-1) << QString();
+     QTest::newRow("-124125534") << QMetaType::Type(-124125534) << QString();
+     QTest::newRow("124125534") << QMetaType::Type(124125534) << QString();
  }
  
  void tst_QMetaType::typeName()

diff --cc tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
Simple merge

diff --cc tests/auto/corelib/tools/qlist/tst_qlist.cpp
Simple merge