Switch the code path from the old compiler and VME to the new code path

Change-Id: Ib1b38ec07830f8df9fa4caacd00879434608053b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index e9a0858..c344c3e 100644 (file)
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -552,8 +552,6 @@ the same object as is returned from the Qt.include() call.
 */
 // Qt.include() is implemented in qv4include.cpp
 
-DEFINE_BOOL_CONFIG_OPTION(qmlUseNewCompiler, QML_NEW_COMPILER)
-
 QQmlEnginePrivate::QQmlEnginePrivate(QQmlEngine *e)
 : propertyCapture(0), rootContext(0), isDebugging(false),
   profiler(0), outputWarningsToStdErr(true),
@@ -564,7 +562,7 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQmlEngine *e)
   scarceResourcesRefCount(0), importDatabase(e), typeLoader(e), uniqueId(1),
   incubatorCount(0), incubationController(0), mutex(QMutex::Recursive)
 {
-    useNewCompiler = qmlUseNewCompiler();
+    useNewCompiler = true;
 }
 
 QQmlEnginePrivate::~QQmlEnginePrivate()

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index a330cd4..60c83a1 100644 (file)
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -36,7 +36,6 @@ PRIVATETESTS += \
     qqmlexpression \
     qqmldirparser \
     qqmlglobal \
-    qqmlinstruction \
     qqmllanguage \
     qqmlproperty \
     qqmlpropertycache \