diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-21 10:34:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-21 10:34:41 +0100 |
| commit | c08ec43406c4ebe2e93942a8b07871c73aafde51 (patch) | |
| tree | 69e84f955ce6d0f66d39eae36b07ae0f8ef65e56 /src/quick/util/qquickglobal.cpp | |
| parent | 242067390f3bd891b162164a2d01a3a982c64fa2 (diff) | |
| parent | 5b82c1b7abc515274e6348136356bbf8f1374e4a (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I3567f741394f912d4312460e85555b6c39b61cb4
Diffstat (limited to 'src/quick/util/qquickglobal.cpp')
| -rw-r--r-- | src/quick/util/qquickglobal.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 3cb7cc3b7f..d1ca02d79f 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -466,7 +466,11 @@ public: } break; case QMetaType::QMatrix4x4: - if (argc == 1) { + if (argc == 0) { + QMatrix4x4 m; + *v = QVariant(m); + return true; + } else if (argc == 1) { const qreal *vals = reinterpret_cast<const qreal*>(argv[0]); QMatrix4x4 m(vals[0], vals[1], vals[2], vals[3], vals[4], vals[5], vals[6], vals[7], |