AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tst_moc: remove QtSvg dependency
This commit is contained in:
Qt Continuous Integration System 2011-05-13 19:19:33 +10:00
commit ed76e600d9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/host.pro
View File

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

2
tests/auto/moc/moc.pro
View File

@ -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 if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h
SOURCES += tst_moc.cpp SOURCES += tst_moc.cpp
QT += sql network svg QT += sql network
contains(QT_CONFIG, script): QT += script contains(QT_CONFIG, script): QT += script
contains(QT_CONFIG, qt3support): QT += qt3support contains(QT_CONFIG, qt3support): QT += qt3support
contains(QT_CONFIG, dbus){ contains(QT_CONFIG, dbus){

2
tests/auto/moc/no-keywords.h
View File

@ -51,7 +51,7 @@
#include <QtCore> #include <QtCore>
#include <QtNetwork/QtNetwork> #include <QtNetwork/QtNetwork>
#include <QtSql/QtSql> #include <QtSql/QtSql>
#include <QtSvg> //#include <QtSvg>
#if defined(QT3_SUPPORT) #if defined(QT3_SUPPORT)
#include <Qt3Support> #include <Qt3Support>
#endif #endif