diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-29 16:51:18 +1000 |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-29 16:51:18 +1000 |
commit | 245f2d6d8bf32dcfa28501a9944de00e1e4e1875 (patch) | |
tree | bba1eb8796905fb1ed3d92c59f8841cf848bf2aa /tests/auto/auto.pro | |
parent | 7123ef04484f283ffa30ece8cb73f541bd81e830 (diff) | |
parent | 2f91e9ce0e02f613d68b5b59d00b61c8f4f12c68 (diff) |
Merge ../../qt/master
Conflicts:
tests/auto/tests.xml
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r-- | tests/auto/auto.pro | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 50ab90223e..aacb1dc32a 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -8,10 +8,14 @@ TEMPLATE = subdirs compiler \ compilerwarnings \ linguist \ + maketestselftest \ moc \ uic \ uic3 \ - guiapplauncher + guiapplauncher \ + #atwrapper \ # These tests need significant updating, + #uiloader \ # they have hardcoded machine names etc. + Q3SUBDIRS += \ q3accel \ q3action \ @@ -130,6 +134,7 @@ SUBDIRS += \ qdoublevalidator \ qdrag \ qerrormessage \ + qevent \ qeventloop \ qexplicitlyshareddatapointer \ qfile \ @@ -489,7 +494,8 @@ embedded:!wince* { } symbian { - SUBDIRS += qsoftkeymanager + SUBDIRS += qsoftkeymanager \ + qs60mainapplication } # Enable the tests specific to QtXmlPatterns. If you add a test, remember to @@ -574,3 +580,21 @@ contains(QT_CONFIG, webkit): SUBDIRS += \ qwebhistory contains(QT_CONFIG, declarative): SUBDIRS += declarative + +# Following tests depends on private API +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qcssparser \ + qgraphicssceneindex \ + qhttpnetworkconnection \ + qhttpnetworkreply \ + qnativesocketengine \ + qnetworkreply \ + qpathclipper \ + qsocketnotifier \ + qsocks5socketengine \ + qstylesheetstyle \ + qtextpiecetable \ + xmlpatternsdiagnosticsts \ + xmlpatternsview \ + xmlpatternsxqts \ + xmlpatternsxslts |