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/qml/ftw/qqmlrefcount_p.h | |
| parent | 4dc68ba888c7dbb7bd16455991f6d5814df13cba (diff) | |
| parent | 84155a8e1a6250d3e4b0949a42464eee5dfef537 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6
Diffstat (limited to 'src/qml/qml/ftw/qqmlrefcount_p.h')
| -rw-r--r-- | src/qml/qml/ftw/qqmlrefcount_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/ftw/qqmlrefcount_p.h b/src/qml/qml/ftw/qqmlrefcount_p.h index 8a268807d7..59ed77b580 100644 --- a/src/qml/qml/ftw/qqmlrefcount_p.h +++ b/src/qml/qml/ftw/qqmlrefcount_p.h @@ -47,7 +47,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qatomic.h> -#include <private/qtqmlglobal_p.h> +#include <private/qv4global_p.h> QT_BEGIN_NAMESPACE |