diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2011-02-16 11:54:13 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2011-02-16 11:54:13 (GMT) |
| commit | 0df215e5afc780c1fddd9e410f7ef0814ac1307c (patch) | |
| tree | 6ac4abf3fcc9c41093b760f4f113221811e2e2ad /tests/auto/gui.pro | |
| parent | 3f3a0f31b74774051021d969e008d7bd1536b010 (diff) | |
| parent | 0a24d2d6269d509e775f7da91c8002eddc2dcbd7 (diff) | |
| download | Qt-0df215e5afc780c1fddd9e410f7ef0814ac1307c.zip Qt-0df215e5afc780c1fddd9e410f7ef0814ac1307c.tar.gz Qt-0df215e5afc780c1fddd9e410f7ef0814ac1307c.tar.bz2 | |
Merge remote branch 'qt/master' into earth-team-staging
Conflicts:
src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'tests/auto/gui.pro')
| -rw-r--r-- | tests/auto/gui.pro | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index 30155ea..07dc5ef 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -82,11 +82,6 @@ SUBDIRS=\ qgroupbox \ qguivariant \ qheaderview \ - qhelpcontentmodel \ - qhelpenginecore \ - qhelpgenerator \ - qhelpindexmodel \ - qhelpprojectdata \ qicoimageformat \ qicon \ qimageiohandler \ @@ -224,10 +219,5 @@ win32:SUBDIRS -= qtextpiecetable qtextpiecetable \ symbian:SUBDIRS -= \ - qhelpcontentmodel \ - qhelpenginecore \ - qhelpgenerator \ - qhelpindexmodel \ - qhelpprojectdata \ qsystemtrayicon \ |