summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-30 13:25:53 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-30 13:28:35 +0200
commit42f485231c6bdbf2ad42e9483ec372b108d40f37 (patch)
treefd0ab45513e9f7c9b2af9a751ec8d7c469725ab2 /examples
parent15849d78b7cca848b87badcfee33db1db70b8b52 (diff)
parentac44a5b574289e8a24c7ad76760fdbb0a0728478 (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: src/quick/items/context2d/qquickcanvasitem.cpp src/quickwidgets/qquickwidget.cpp tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp Change-Id: Idf279cb88e0df2a383489af5b6afdf04d04ae611
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
index 078d8e7e03..ea6c7f2f9a 100644
--- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
+++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
@@ -40,6 +40,7 @@
#include "mainwindow.h"
#include "fbitem.h"
+#include <QCoreApplication>
#include <QVBoxLayout>
#include <QGroupBox>
#include <QRadioButton>