diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-19 13:09:08 +0200 |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-19 13:09:08 +0200 |
| commit | b83f7460e1b95e9cce81eda728a6790d391b4188 (patch) | |
| tree | 22c02137c38ba144c977c1ff9d8329f565b1f3c6 | |
| parent | 13c5fcb72cbe96f78be9b7cdbadff6012e7b66a3 (diff) | |
make moc autotest compile without qtscript
| -rw-r--r-- | tests/auto/moc/moc.pro | 3 | ||||
| -rw-r--r-- | tests/auto/moc/no-keywords.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/moc/moc.pro b/tests/auto/moc/moc.pro index f96b4e2367..a89ff07e78 100644 --- a/tests/auto/moc/moc.pro +++ b/tests/auto/moc/moc.pro @@ -20,7 +20,8 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n if(*-g++*|*-icc*):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h SOURCES += tst_moc.cpp -QT += sql network svg script +QT += sql network svg +contains(QT_CONFIG, script): QT += script contains(QT_CONFIG, qt3support): QT += qt3support contains(QT_CONFIG, dbus){ DEFINES += WITH_DBUS diff --git a/tests/auto/moc/no-keywords.h b/tests/auto/moc/no-keywords.h index f062dffa5b..a7d76e77e4 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 |