diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-05-13 15:52:30 +0300 |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-05-13 15:52:30 +0300 |
| commit | 890d08add40ec7f3dcb34b69432ba8d5080d5f7c (patch) | |
| tree | d6d04bf3ab57f772d2c165bccd548004f77f2181 | |
| parent | f3341fd555b19ddfaf9484b84a366fa12c966f6a (diff) | |
| parent | bcc7ddff9f9a6cccc6425133140d9781abf32059 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
| -rw-r--r-- | tests/auto/host.pro | 2 | ||||
| -rw-r--r-- | tests/auto/moc/moc.pro | 2 | ||||
| -rw-r--r-- | tests/auto/moc/no-keywords.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/host.pro b/tests/auto/host.pro index 18d0009b8f..44216ae101 100644 --- a/tests/auto/host.pro +++ b/tests/auto/host.pro @@ -3,7 +3,7 @@ SUBDIRS=\ compiler \ headersclean \ maketestselftest \ - #moc \ # FIXME: uses qtsvg (QTBUG-19243) + moc \ uic \ qmake \ rcc \ diff --git a/tests/auto/moc/moc.pro b/tests/auto/moc/moc.pro index 4fb9ac4f5a..e150d37619 100644 --- a/tests/auto/moc/moc.pro +++ b/tests/auto/moc/moc.pro @@ -20,7 +20,7 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h SOURCES += tst_moc.cpp -QT += sql network svg +QT += sql network contains(QT_CONFIG, script): QT += script contains(QT_CONFIG, qt3support): QT += qt3support contains(QT_CONFIG, dbus){ diff --git a/tests/auto/moc/no-keywords.h b/tests/auto/moc/no-keywords.h index 06e2006669..1ebc4062c2 100644 --- a/tests/auto/moc/no-keywords.h +++ b/tests/auto/moc/no-keywords.h @@ -51,7 +51,7 @@ #include <QtCore> #include <QtNetwork/QtNetwork> #include <QtSql/QtSql> -#include <QtSvg> +//#include <QtSvg> #if defined(QT3_SUPPORT) #include <Qt3Support> #endif |