diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:43:54 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:43:55 +0200 |
| commit | be4b80af8235d5f5664f03589258eec0e43da78b (patch) | |
| tree | 9a5a8dcaae5d4da3632f0be8fa1af42c751ae22e /tests | |
| parent | 0715dc9ee32054c4a344dc7d8694cf0b8b6cbdbb (diff) | |
| parent | 2d9cd8eef8652873e73d5cde6b6545eea9a17612 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: If29ca1b27da4592d40a7678837c359f75dac1209
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> |