aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlengine.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-03-05 10:27:14 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-06 14:23:22 +0100
commitcb7e8dabf6e5b323bd3f2511127f63bee732fd99 (patch)
tree3c4c52bec25adf0a4cdc71f1641fc490d8303d6d /src/qml/qml/qqmlengine.cpp
parent6ed6a459647606b71ae9d2b768e8f627eceec3df (diff)
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>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
-rw-r--r--src/qml/qml/qqmlengine.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index e9a0858474..c344c3e069 100644
--- 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()