diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-04-30 10:44:29 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-02 08:40:48 +0200 |
commit | c3e1e6390edbc28e6e528f401eb4f3639661302b (patch) | |
tree | 5c882bfe7fced9b357e80a6b56ccdc88de8a41c3 /src/quick/designer | |
parent | 9709d04ba7787c853a1ddbeed0347eab27c0924f (diff) | |
parent | 6a2febc680e163e56eb61d322d156dbf6fb07e0e (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I71275a2076c3d32ee2896571be882067320a2e9e
Diffstat (limited to 'src/quick/designer')
-rw-r--r-- | src/quick/designer/qquickdesignercustomparserobject.cpp | 2 | ||||
-rw-r--r-- | src/quick/designer/qquickdesignerwindowmanager.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/designer/qquickdesignercustomparserobject.cpp b/src/quick/designer/qquickdesignercustomparserobject.cpp index b785abe361..9145b1367a 100644 --- a/src/quick/designer/qquickdesignercustomparserobject.cpp +++ b/src/quick/designer/qquickdesignercustomparserobject.cpp @@ -57,3 +57,5 @@ void QQuickDesignerCustomParser::applyBindings(QObject *, QV4::CompiledData::Com } QT_END_NAMESPACE + +#include "moc_qquickdesignercustomparserobject_p.cpp" diff --git a/src/quick/designer/qquickdesignerwindowmanager.cpp b/src/quick/designer/qquickdesignerwindowmanager.cpp index e2d7b98c33..093559a572 100644 --- a/src/quick/designer/qquickdesignerwindowmanager.cpp +++ b/src/quick/designer/qquickdesignerwindowmanager.cpp @@ -115,3 +115,4 @@ void QQuickDesignerWindowManager::update(QQuickWindow *window) QT_END_NAMESPACE +#include "moc_qquickdesignerwindowmanager_p.cpp" |