Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tst_moc: remove QtSvg dependency

tests/auto/host.pro

@@ -3,7 +3,7 @@ SUBDIRS=\
            compiler \
            headersclean \
            maketestselftest \
-           #moc \           # FIXME: uses qtsvg (QTBUG-19243)
+           moc \
            uic \
            qmake \
            rcc \

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){

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