remove warning about 4.7 imports

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index d3ae817..179257f 100644 (file)
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -704,15 +704,6 @@ int QDeclarativePrivate::qmlregister(RegistrationType type, void *data)
 */
 bool QDeclarativeMetaType::isModule(const QByteArray &module, int versionMajor, int versionMinor)
 {
-    // "import Qt 4.7" should have died off
-    if (strcmp(module.constData(), "Qt") == 0 && versionMajor == 4 && versionMinor == 7) {
-        static bool qt47Registered = false;
-        if (!qt47Registered) {
-            qWarning() << Q_FUNC_INFO << "Qt 4.7 import detected; please note that Qt 4.7 is directly reusable as QtQuick 1.x with no code changes.";
-            qt47Registered = true;
-        }
-    }
-
     const QDeclarativeMetaTypeData *data = metaTypeData();
     const QDeclarativeMetaTypeData::ModuleInfoHash::const_iterator it = data->modules.constFind(module);
     return it != data->modules.constEnd()

diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
index a63d701..ce6b0b1 100644 (file)
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
@@ -19,6 +19,6 @@
 **
 ****************************************************************************/
 
-import Qt.test 4.6
+import Qt.test 2.0
 
 MyQmlObject {}

diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
index b739e2d..12cbfbb 100644 (file)
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
@@ -19,7 +19,7 @@
 **
 ****************************************************************************/
 
-import Qt.test 4.6
+import Qt.test 2.0
 
 MyQmlObject {
     result: value