diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2015-04-13 14:28:58 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@digia.com> | 2015-04-13 14:28:58 +0200 |
| commit | 02ff2973ceeef00ced4468b6e15cfadd9f021b0d (patch) | |
| tree | e5b51329fceb3d0134e533e41c0f3800549f1786 /tests/manual | |
| parent | c5b743472fc36986cf34636dbcb73a0d0fa6b9e6 (diff) | |
| parent | 16c32710bc8a5ecefc833352159361be564f3fe4 (diff) | |
Merge remote-tracking branch 'gerrit/dev' into dev-highdpi
Conflicts:
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Change-Id: Ib7f277957636186d0abd58d8c710392ef7b02e13
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/dialogs/filedialogpanel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp index 32a6c3e190..eda56bef94 100644 --- a/tests/manual/dialogs/filedialogpanel.cpp +++ b/tests/manual/dialogs/filedialogpanel.cpp @@ -48,6 +48,7 @@ #include <QLabel> #include <QMessageBox> #include <QApplication> +#include <QUrl> #include <QTimer> #include <QDebug> |