From b83f7460e1b95e9cce81eda728a6790d391b4188 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 19 Aug 2009 13:09:08 +0200 Subject: make moc autotest compile without qtscript --- tests/auto/moc/moc.pro | 3 ++- tests/auto/moc/no-keywords.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/auto/moc/moc.pro b/tests/auto/moc/moc.pro index f96b4e2..a89ff07 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 f062dff..a7d76e7 100644 --- a/tests/auto/moc/no-keywords.h +++ b/tests/auto/moc/no-keywords.h @@ -58,7 +58,9 @@ #if defined(WITH_DBUS) #include #endif +#ifdef QT_SCRIPT_LIB #include +#endif #undef signals #undef slots -- cgit v0.12