diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
| commit | 3a6f5735ee723ff998114314c5ccdf6609667f6f (patch) | |
| tree | 9c877dd1e35972fa336cea8a61986594f168b49c /src/qml/qml/ftw | |
| parent | 000b6330d4ca7165ff241b21ee728ed28d82fba1 (diff) | |
| parent | 17ded06804576dfde1b19f82f168f7ceb09ec92c (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4
Conflicts:
src/quick/items/context2d/qquickcontext2d.cpp
tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
Change-Id: I36a4fd28b3156839aecd70039a3ba566bf19a0bc
Diffstat (limited to 'src/qml/qml/ftw')
| -rw-r--r-- | src/qml/qml/ftw/qqmltrace.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/ftw/qqmltrace.cpp b/src/qml/qml/ftw/qqmltrace.cpp index 98f86dad32..9bf58c245c 100644 --- a/src/qml/qml/ftw/qqmltrace.cpp +++ b/src/qml/qml/ftw/qqmltrace.cpp @@ -43,6 +43,7 @@ #ifdef QML_ENABLE_TRACE #include <stdio.h> +#include <unistd.h> #endif QT_BEGIN_NAMESPACE |