diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 11:02:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 12:48:12 +0200 |
| commit | 6697f2a899fac47a65122a85691b2cfe63c6152c (patch) | |
| tree | 6ae8ad93c7455f9571d1b1b868ae077af89d96df /tests/auto/gui.pro | |
| parent | e577d02cc9cba2033cd21c23a4420a1f0d5469a4 (diff) | |
| parent | 1f806aa1b40db276dad359863d018171080d93f9 (diff) | |
Merge remote branch 'origin/master' into refactor
Conflicts:
src/gui/gui.pro
src/gui/painting/painting.pri
src/opengl/opengl.pro
src/openvg/openvg.pro
Diffstat (limited to 'tests/auto/gui.pro')
| -rw-r--r-- | tests/auto/gui.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index b7d4ad30b7..afa6ad3a55 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -84,6 +84,7 @@ SUBDIRS=\ qheaderview \ qicoimageformat \ qicon \ + qidentityproxymodel \ qimageiohandler \ qimagereader \ qimagewriter \ @@ -102,7 +103,7 @@ SUBDIRS=\ qlistview \ qlistwidget \ qlocale \ - qlocalsocket \ + #qlocalsocket \ # FIXME: uses qtscript, shouldn't be in qtbase qmacstyle \ qmainwindow \ qmatrixnxn \ |