diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 12:48:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 12:48:06 +0100 |
| commit | 5d150f63e1a188414e4951c4b6e4c7c474d9b4e6 (patch) | |
| tree | d249fdfd8480b367ad238b62602f48254dceda11 /src/qml/qml/v4 | |
| parent | 63064c7ed7a23c1749ed7f58d55b680190dc01c4 (diff) | |
| parent | ef92d6f8ef649fdaf50c123c6ca978b6db6892f6 (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/qml/parser/qqmljskeywords_p.h
sync.profile
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Change-Id: I9bc6659e1bab924009167bec567354d40a77a8cb
Diffstat (limited to 'src/qml/qml/v4')
| -rw-r--r-- | src/qml/qml/v4/qv4bindings.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v4/qv4compiler.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v4/qv4irbuilder.cpp | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp index 84bdbfda7a..48b2ad948a 100644 --- a/src/qml/qml/v4/qv4bindings.cpp +++ b/src/qml/qml/v4/qv4bindings.cpp @@ -68,8 +68,6 @@ #include <QtCore/qmath.h> #include <math.h> // ::fmod -Q_DECLARE_METATYPE(QJSValue) - #ifdef Q_CC_MSVC // MSVC2010 warns about 'unreferenced formal parameter', even if it's used in p->~T() # pragma warning( disable : 4100 ) diff --git a/src/qml/qml/v4/qv4compiler.cpp b/src/qml/qml/v4/qv4compiler.cpp index 2b01acbddf..c12d59d420 100644 --- a/src/qml/qml/v4/qv4compiler.cpp +++ b/src/qml/qml/v4/qv4compiler.cpp @@ -50,8 +50,6 @@ #include <private/qqmlaccessors_p.h> #include <private/qqmljsengine_p.h> -Q_DECLARE_METATYPE(QJSValue) - QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(bindingsDump, QML_BINDINGS_DUMP) diff --git a/src/qml/qml/v4/qv4irbuilder.cpp b/src/qml/qml/v4/qv4irbuilder.cpp index bd875c185e..6e18091d6b 100644 --- a/src/qml/qml/v4/qv4irbuilder.cpp +++ b/src/qml/qml/v4/qv4irbuilder.cpp @@ -48,8 +48,6 @@ DEFINE_BOOL_CONFIG_OPTION(qmlVerboseCompiler, QML_VERBOSE_COMPILER) -Q_DECLARE_METATYPE(QJSValue) - QT_BEGIN_NAMESPACE using namespace QQmlJS; |