diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 13:38:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 13:38:20 (GMT) |
| commit | 68d55f6e04f77ad590231fde4ef0f5fe7fa8ca82 (patch) | |
| tree | c05f63033811d3e5c0751aa17fe2f44e9ec23066 /tests/benchmarks/gui/graphicsview | |
| parent | 65f5cecdd0343d816d9abb8342bd8b2faecdf3b8 (diff) | |
| parent | 0e91875345c4505abac54f6d2cb03252332fcbfb (diff) | |
| download | Qt-68d55f6e04f77ad590231fde4ef0f5fe7fa8ca82.zip Qt-68d55f6e04f77ad590231fde4ef0f5fe7fa8ca82.tar.gz Qt-68d55f6e04f77ad590231fde4ef0f5fe7fa8ca82.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Support for adding user specified list type content in rss file
Fixed RSS_RULES statement in application_icon.prf
XFAIL for a new qwidget autotest on MAC and QWS.
Fixed dialog resize not to move the dialog for Symbian.
Fix SDP files are not supported.
Fix build break caused by undefined symbol SetDialogPreference
Renamed test benchmark targets.
Added check for null pointer in qt_vg_unregister_pixmap.
Add '.' dir as the first include directory in Symbian
Enabled some examples by default in Symbian builds
Added forwarding headers for qplatformdefs.h in Symbian mkspecs
QUnixPrintWidget should not be declared in Symbian
Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location.
Export qtdemoapps.iby to proper location
Added some missing IBY export paths to platform_path.prf
Diffstat (limited to 'tests/benchmarks/gui/graphicsview')
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro index 0d563b9..3ede6e8 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro @@ -1,6 +1,6 @@ load(qttest_p4) TEMPLATE = app -TARGET = tst_qgraphicsanchorlayout +TARGET = tst_bench_qgraphicsanchorlayout SOURCES += tst_qgraphicsanchorlayout.cpp diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro index 726bb96..d4935c0 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro @@ -1,5 +1,5 @@ load(qttest_p4) TEMPLATE = app -TARGET = tst_qgraphicsitem +TARGET = tst_bench_qgraphicsitem SOURCES += tst_qgraphicsitem.cpp diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro index b460e2a..1b7a5dc 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro @@ -1,6 +1,6 @@ load(qttest_p4) TEMPLATE = app -TARGET = tst_qgraphicsscene +TARGET = tst_bench_qgraphicsscene SOURCES += tst_qgraphicsscene.cpp diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro index 927d731..6e044f9 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro @@ -1,6 +1,6 @@ load(qttest_p4) TEMPLATE = app -TARGET = tst_qgraphicsview +TARGET = tst_bench_qgraphicsview SOURCES += tst_qgraphicsview.cpp RESOURCES += qgraphicsview.qrc diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro index f1ec54e..ed53237 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro @@ -1,6 +1,6 @@ load(qttest_p4) TEMPLATE = app -TARGET = tst_qgraphicswidget +TARGET = tst_bench_qgraphicswidget TEMPLATE = app # Input SOURCES += tst_qgraphicswidget.cpp |