diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-15 22:39:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-15 22:39:25 +0200 |
| commit | e5bcf68d3055d6738b56cbbafb407bad4363e63c (patch) | |
| tree | d70319316c926697e136527ce9a6628d34f0ebc4 /tests | |
| parent | d57d184b6d18deab172ac400b9db973e6aacab21 (diff) | |
| parent | be4b80af8235d5f5664f03589258eec0e43da78b (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/tools/moc/no-keywords.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/tools/moc/no-keywords.h b/tests/auto/tools/moc/no-keywords.h index e04e36b678..ffd5928370 100644 --- a/tests/auto/tools/moc/no-keywords.h +++ b/tests/auto/tools/moc/no-keywords.h @@ -47,7 +47,7 @@ #define slots Baz #define emit Yoyodyne -#include <QtGui/QtGui> +#include <QtConcurrent/QtConcurrent> #include <QtCore> #include <QtNetwork/QtNetwork> #include <QtSql/QtSql> |