diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-03-11 08:21:15 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-03-11 08:21:15 (GMT) |
| commit | 327c36acdba0422e93d99dc71cb3f5238d326977 (patch) | |
| tree | d85c7b186af9a9324bb4acc5e36d630966876fee /tests/benchmarks/gui/painting/qtbench/qtbench.pro | |
| parent | b9f8c1491550fe671d1809481ad7f70737034a3b (diff) | |
| parent | 16e8cc808ae7087aadd95855c97d715941711b45 (diff) | |
| download | Qt-327c36acdba0422e93d99dc71cb3f5238d326977.zip Qt-327c36acdba0422e93d99dc71cb3f5238d326977.tar.gz Qt-327c36acdba0422e93d99dc71cb3f5238d326977.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7-lighthouse
Conflicts:
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/kernel/qwidget.cpp
Diffstat (limited to 'tests/benchmarks/gui/painting/qtbench/qtbench.pro')
| -rw-r--r-- | tests/benchmarks/gui/painting/qtbench/qtbench.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/benchmarks/gui/painting/qtbench/qtbench.pro b/tests/benchmarks/gui/painting/qtbench/qtbench.pro new file mode 100644 index 0000000..91f416d --- /dev/null +++ b/tests/benchmarks/gui/painting/qtbench/qtbench.pro @@ -0,0 +1,6 @@ +load(qttest_p4) +TEMPLATE = app +TARGET = tst_qtbench + +SOURCES += tst_qtbench.cpp + |