diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-17 09:32:34 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-17 09:52:19 +0100 |
| commit | fb0cb17cb55c9ed44b7fcbc92efcc244e96c9b36 (patch) | |
| tree | 2ba609d4c6416036d3cb5f345a6c1125e0f105d6 /src/qml/memory | |
| parent | 4dc68ba888c7dbb7bd16455991f6d5814df13cba (diff) | |
| parent | 84155a8e1a6250d3e4b0949a42464eee5dfef537 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6
Diffstat (limited to 'src/qml/memory')
| -rw-r--r-- | src/qml/memory/memory.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/memory/memory.pri b/src/qml/memory/memory.pri index 194df06e85..04b7566ccc 100644 --- a/src/qml/memory/memory.pri +++ b/src/qml/memory/memory.pri @@ -6,7 +6,9 @@ SOURCES += \ $$PWD/qv4mm.cpp \ HEADERS += \ - $$PWD/qv4heap_p.h \ - $$PWD/qv4mm_p.h \ + $$PWD/qv4mm_p.h } + +HEADERS += \ + $$PWD/qv4heap_p.h |