diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 11:42:54 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 11:42:54 (GMT) |
commit | 3286c4d489905d27183a9ba18048c11a5af8913c (patch) | |
tree | 392cc7137ffd69b305272f672db55a73be4f1dae /tests/auto/auto.pro | |
parent | 1bc1e5c0b76a92594c5254e72d25165879e753d2 (diff) | |
parent | 6b651e5f69b656c6c6fa05b6a81674a4fd56a160 (diff) | |
download | Qt-3286c4d489905d27183a9ba18048c11a5af8913c.zip Qt-3286c4d489905d27183a9ba18048c11a5af8913c.tar.gz Qt-3286c4d489905d27183a9ba18048c11a5af8913c.tar.bz2 |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r-- | tests/auto/auto.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index ad58d30..da1f7ca 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -136,6 +136,7 @@ SUBDIRS += \ qfocusevent \ qfocusframe \ qfont \ + qfontcombobox \ qfontdatabase \ qfontdialog \ qfontmetrics \ |