diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
| commit | 34679dd23213881a9632e21e4858377ff90a9006 (patch) | |
| tree | deb9ebf681d4954b2d44858ca1a14d251c31e8eb /tests/auto/moc/no-keywords.h | |
| parent | 7669f91c33328505fbe52f4913bd3f8745b76d31 (diff) | |
| parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
src/corelib/io/qfilesystemwatcher_symbian_p.h
Diffstat (limited to 'tests/auto/moc/no-keywords.h')
| -rw-r--r-- | tests/auto/moc/no-keywords.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/moc/no-keywords.h b/tests/auto/moc/no-keywords.h index f062dffa5..a7d76e77e 100644 --- a/tests/auto/moc/no-keywords.h +++ b/tests/auto/moc/no-keywords.h @@ -58,7 +58,9 @@ #if defined(WITH_DBUS) #include <QtDBus> #endif +#ifdef QT_SCRIPT_LIB #include <QtScript> +#endif #undef signals #undef slots |