diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /tests/benchmarks/gui | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'tests/benchmarks/gui')
6 files changed, 3 insertions, 16 deletions
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro index 3c880eeb4d..00becec216 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro @@ -2,6 +2,5 @@ QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qgraphicswidget -TEMPLATE = app -# Input + SOURCES += tst_qgraphicswidget.cpp diff --git a/tests/benchmarks/gui/image/blendbench/blendbench.pro b/tests/benchmarks/gui/image/blendbench/blendbench.pro index 74ba0a5920..17c18301bb 100644 --- a/tests/benchmarks/gui/image/blendbench/blendbench.pro +++ b/tests/benchmarks/gui/image/blendbench/blendbench.pro @@ -1,7 +1,5 @@ TEMPLATE = app TARGET = tst_bench_blendbench -DEPENDPATH += . -INCLUDEPATH += . QT += testlib -# Input + SOURCES += main.cpp diff --git a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro index 7f5d829b26..074c764e50 100644 --- a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro +++ b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro @@ -1,5 +1,5 @@ TARGET = tst_bench_qpixmapcache TEMPLATE = app QT += testlib -# Input + SOURCES += tst_qpixmapcache.cpp diff --git a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro index 19ca697102..86a016d42e 100644 --- a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro +++ b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro @@ -2,10 +2,7 @@ QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qapplication -DEPENDPATH += . -INCLUDEPATH += . CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/gui/painting/qregion/qregion.pro b/tests/benchmarks/gui/painting/qregion/qregion.pro index 99bbd39043..1ff55080c5 100644 --- a/tests/benchmarks/gui/painting/qregion/qregion.pro +++ b/tests/benchmarks/gui/painting/qregion/qregion.pro @@ -1,9 +1,6 @@ TEMPLATE = app TARGET = tst_bench_qregion -DEPENDPATH += . -INCLUDEPATH += . QT += testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro index 82558e7ec9..5aef3520c0 100644 --- a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro @@ -1,11 +1,7 @@ TEMPLATE = app QT += widgets testlib TARGET = tst_bench_qstylesheetstyle -DEPENDPATH += . -INCLUDEPATH += . - CONFIG += release -# Input SOURCES += main.cpp |