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 /tests/auto/qml/qqmllanguage/testtypes.h | |
| 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 'tests/auto/qml/qqmllanguage/testtypes.h')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h index 1f9a8492d9..e83e9e11ac 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.h +++ b/tests/auto/qml/qqmllanguage/testtypes.h @@ -66,8 +66,6 @@ public: int id; }; -Q_DECLARE_METATYPE(QJSValue) - QT_BEGIN_NAMESPACE #define MyInterface_iid "org.qt-project.Qt.Test.MyInterface" Q_DECLARE_INTERFACE(MyInterface, MyInterface_iid); @@ -941,7 +939,7 @@ class MyUncreateableBaseClass : public QObject Q_PROPERTY(bool prop2 READ prop2 WRITE setprop2 REVISION 1) Q_PROPERTY(bool prop3 READ prop3 WRITE setprop3 REVISION 1) public: - explicit MyUncreateableBaseClass(bool arg, QObject *parent = 0) + explicit MyUncreateableBaseClass(bool /* arg */, QObject *parent = 0) : QObject(parent), _prop1(false), _prop2(false), _prop3(false) { } |