diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-04 12:12:57 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-04 12:12:57 (GMT) |
commit | babf1ff43584b454ac24728fbf93bf291b9f36d1 (patch) | |
tree | c1d7567183d4a124fd4417a23e558d4fcef847ad /tests/auto/quuid/quuid.pro | |
parent | 05e8e8056824dfa56830e12a6a50ec39018df6fc (diff) | |
parent | a6633a9cf1bb2083d0ce41f4667b3f9349a39865 (diff) | |
download | Qt-babf1ff43584b454ac24728fbf93bf291b9f36d1.zip Qt-babf1ff43584b454ac24728fbf93bf291b9f36d1.tar.gz Qt-babf1ff43584b454ac24728fbf93bf291b9f36d1.tar.bz2 |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
configure
Diffstat (limited to 'tests/auto/quuid/quuid.pro')
-rw-r--r-- | tests/auto/quuid/quuid.pro | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/quuid/quuid.pro b/tests/auto/quuid/quuid.pro index f7608fa..25e2456 100644 --- a/tests/auto/quuid/quuid.pro +++ b/tests/auto/quuid/quuid.pro @@ -1,3 +1,6 @@ -load(qttest_p4) -QT = core -SOURCES += tst_quuid.cpp +TEMPLATE = subdirs + +SUBDIRS = testProcessUniqueness + +SUBDIRS += test + |