From 01dc7e2ea476e0e6dcdce2e72979bbc858f4057d Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Tue, 31 Jan 2012 16:52:36 +1000
Subject: Remove QtQuick1 elements from qtdeclarative

QtQuick1 is now contained in a separate repository.

Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 src/quick/items/qquickitemsmodule.cpp | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/quick/items/qquickitemsmodule.cpp')

diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index b7bf5145dd..3d1e96da84 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -230,18 +230,9 @@ void QQuickItemsModule::defineModule()
         return;
     initialized = true;
 
-    // XXX todo -  Remove before final integration...
-    QByteArray mode = qgetenv("QMLSCENE_IMPORT_NAME");
     QByteArray name = "QtQuick";
     int majorVersion = 2;
     int minorVersion = 0;
-    if (mode == "quick1") {
-        majorVersion = 1;
-    } else if (mode == "qt") {
-        name = "Qt";
-        majorVersion = 4;
-        minorVersion = 7;
-    }
 
     qt_quickitems_defineModule(name, majorVersion, minorVersion);
 }
-- 
cgit v1.2.3