diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-01 23:26:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-01 23:26:13 (GMT) |
| commit | 95814418f9d6adeba365c795462e8afb00138211 (patch) | |
| tree | f7528ae97d136474ae300daa513acc0250f02d4e /tests/auto/gui.pro | |
| parent | 88253db8a7d7910e1393b1948fb3747117538c92 (diff) | |
| parent | 119a8ddcd7c8de0607309b37f9ef83439b607f17 (diff) | |
| download | Qt-95814418f9d6adeba365c795462e8afb00138211.zip Qt-95814418f9d6adeba365c795462e8afb00138211.tar.gz Qt-95814418f9d6adeba365c795462e8afb00138211.tar.bz2 | |
Merge branch '4.7' into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativelistview.cpp
Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
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 802e74a..4b809fb 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -80,11 +80,6 @@ SUBDIRS=\ qgroupbox \ qguivariant \ qheaderview \ - qhelpcontentmodel \ - qhelpenginecore \ - qhelpgenerator \ - qhelpindexmodel \ - qhelpprojectdata \ qicoimageformat \ qicon \ qimageiohandler \ @@ -221,10 +216,5 @@ win32:SUBDIRS -= qtextpiecetable qtextpiecetable \ symbian:SUBDIRS -= \ - qhelpcontentmodel \ - qhelpenginecore \ - qhelpgenerator \ - qhelpindexmodel \ - qhelpprojectdata \ qsystemtrayicon \ |