diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-03 13:27:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-03 13:27:13 +0100 |
| commit | f2244103ff7a9b61fc7bcb7e920d8cc6b2f5f226 (patch) | |
| tree | 8fe753743c46d4a652f582a7a2a49e5709eaa6e0 /tests/auto/quick/qquicktextedit | |
| parent | 57430b2bdad32150e0ed8ceb6893430363ee6670 (diff) | |
| parent | 164af37710e5721cbc7d79a0af20f2387181c59c (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tools/qmlprofiler/qmlprofilerclient.cpp
Change-Id: I1de8832fefd0e45fea16ca072b6c7ae44fa376d4
Diffstat (limited to 'tests/auto/quick/qquicktextedit')
| -rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index e4473b9540..b0ab58538a 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -43,7 +43,8 @@ #include <QtGui/qguiapplication.h> #include <private/qquicktextedit_p.h> #include <private/qquicktextedit_p_p.h> -#include <private/qquicktext_p_p.h> +#include <private/qquicktext_p.h> +#include <private/qquicktextdocument_p.h> #include <QFontMetrics> #include <QtQuick/QQuickView> #include <QDir> |