diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-25 23:26:53 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-25 23:26:53 (GMT) |
| commit | cbb1b29d397c063fc3bcae04c5b062f20cbd12c5 (patch) | |
| tree | d89cebe45c9f6dfdcab34a95da19ee0d670e30f5 /tests/auto/auto.pro | |
| parent | ed7d58f6668be4ffb5f915722dee81c864f74844 (diff) | |
| parent | 9aa00de1d277763c0f7a380fde27face60e5f686 (diff) | |
| download | Qt-cbb1b29d397c063fc3bcae04c5b062f20cbd12c5.zip Qt-cbb1b29d397c063fc3bcae04c5b062f20cbd12c5.tar.gz Qt-cbb1b29d397c063fc3bcae04c5b062f20cbd12c5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
tools/qdoc3/cppcodemarker.cpp
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 d9e060d..1ec4c16 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -127,6 +127,7 @@ SUBDIRS += \ qexplicitlyshareddatapointer \ qfile \ qfiledialog \ + qfiledialog2 \ qfileinfo \ qfilesystemwatcher \ qfilesystemmodel \ |