diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-01 16:19:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-03 09:24:41 +0200 |
| commit | 7d9780b6308e15dcd4adcb65d7b516666c285f54 (patch) | |
| tree | 94c598d4aba187293dace67011dbcaf8347ef8b7 /src/qml/jsruntime/jsruntime.pri | |
| parent | 8abf7f5876a48c0879bce628597533c7b6eca9a0 (diff) | |
Cleanup exception handling
The code in the Exception class operates entirely on the engine's data,
so move it into ExecutionEngine instead. This eliminates the need for
a QV4::Exception class and catches and old code that tries to still do
catch (Exception &) instead of catch (...)
Change-Id: Ie608bec6af652038aca6c9423c225a4d7eb13b39
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/jsruntime.pri')
| -rw-r--r-- | src/qml/jsruntime/jsruntime.pri | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri index 88cd3a99b0..d5c29e8966 100644 --- a/src/qml/jsruntime/jsruntime.pri +++ b/src/qml/jsruntime/jsruntime.pri @@ -46,7 +46,6 @@ SOURCES += \ $$PWD/qv4qobjectwrapper.cpp \ $$PWD/qv4qmlextensions.cpp \ $$PWD/qv4stacktrace.cpp \ - $$PWD/qv4exception.cpp \ $$PWD/qv4vme_moth.cpp HEADERS += \ @@ -98,7 +97,6 @@ HEADERS += \ $$PWD/qv4qobjectwrapper_p.h \ $$PWD/qv4qmlextensions_p.h \ $$PWD/qv4stacktrace_p.h \ - $$PWD/qv4exception_p.h \ $$PWD/qv4vme_moth_p.h # Use SSE2 floating point math on 32 bit instead of the default @@ -117,7 +115,7 @@ linux*|mac { static_libgcc = $$system($$QMAKE_CXX -print-file-name=libgcc.a) LIBS += $$static_libgcc } - SOURCES += $$PWD/qv4exception_gcc.cpp + SOURCES += $$PWD/qv4engine_cxxabi.cpp DEFINES += V4_CXX_ABI_EXCEPTION } |