diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-13 07:10:51 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-13 07:29:03 +0100 |
commit | 435774ced1f062645a2d48972ac4698c4741c1a7 (patch) | |
tree | f54c53e361d724068aca48823778bd6425c0016b /tests/auto/quick/examples | |
parent | 77e0dc0485953427320ed0b442ba24eef4f9d73b (diff) | |
parent | fb0490dd653e4856a3595bd7e49c3127215170d1 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/qml/qqmlimport.cpp
Change-Id: I26f8d18fe8af664ee8573116f182fe12b71e089a
Diffstat (limited to 'tests/auto/quick/examples')
-rw-r--r-- | tests/auto/quick/examples/tst_examples.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp index d5c9aaeb90..b6742b9efe 100644 --- a/tests/auto/quick/examples/tst_examples.cpp +++ b/tests/auto/quick/examples/tst_examples.cpp @@ -29,7 +29,6 @@ #include <qtest.h> #include <QLibraryInfo> #include <QDir> -#include <QProcess> #include <QDebug> #include <QtQuick/QQuickItem> #include <QtQuick/QQuickView> |