diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-20 12:26:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 12:26:08 +0200 |
| commit | cb6c208c77e2e3c8b6d5957fae73f0326eee4296 (patch) | |
| tree | cd4a956eb3208358c28adbacf11c3694091ce549 /tests/manual | |
| parent | 34956bc234bf1b2ebcf224a256297293ba4276aa (diff) | |
| parent | 3cd46501b2a663c7cb20cae21b4ed051f2ce4ac7 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qml/jit/qv4targetplatform_p.h
src/quick/accessible/qaccessiblequickitem_p.h
Change-Id: Ic95075a5fad81ec997a61561bd65979dfa3b9d4d
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/highdpi/imageprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/highdpi/imageprovider.cpp b/tests/manual/highdpi/imageprovider.cpp index 33a69cb87e..069fa5998f 100644 --- a/tests/manual/highdpi/imageprovider.cpp +++ b/tests/manual/highdpi/imageprovider.cpp @@ -45,7 +45,7 @@ #include <qquickimageprovider.h> #include <QImage> #include <QPainter> -#include <qDebug.h> +#include <QDebug> class ColorImageProvider : public QQuickImageProvider { |