diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 10:00:23 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 10:00:23 +0100 |
| commit | 9d174f13e48730ac06aa429e0f011a02b333025e (patch) | |
| tree | 6075fa3c24880dd6fc548f03395a5809739f67de /tests/benchmarks/corelib/corelib.pro | |
| parent | 4790ab735f96a13027e7292ff5b49195224f0af9 (diff) | |
| parent | e024cc10a97b9518b2dd577175feb66258d7ac05 (diff) | |
| download | qt4-tools-9d174f13e48730ac06aa429e0f011a02b333025e.tar.gz | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'tests/benchmarks/corelib/corelib.pro')
| -rw-r--r-- | tests/benchmarks/corelib/corelib.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/benchmarks/corelib/corelib.pro b/tests/benchmarks/corelib/corelib.pro new file mode 100644 index 0000000000..72fca33c3e --- /dev/null +++ b/tests/benchmarks/corelib/corelib.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs +SUBDIRS = \ + io \ + kernel \ + thread \ + tools |