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/painting | |
| 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/painting')
| -rw-r--r-- | tests/benchmarks/gui/painting/qpainter/qpainter.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/gui/painting/qregion/qregion.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/gui/painting/qtransform/qtransform.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/benchmarks/gui/painting/qpainter/qpainter.pro b/tests/benchmarks/gui/painting/qpainter/qpainter.pro index 5ac8c64..6603aba 100644 --- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro +++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro @@ -1,5 +1,5 @@ load(qttest_p4) TEMPLATE = app -TARGET = tst_qpainter +TARGET = tst_bench_qpainter SOURCES += tst_qpainter.cpp diff --git a/tests/benchmarks/gui/painting/qregion/qregion.pro b/tests/benchmarks/gui/painting/qregion/qregion.pro index fc67177..ec93a62 100644 --- a/tests/benchmarks/gui/painting/qregion/qregion.pro +++ b/tests/benchmarks/gui/painting/qregion/qregion.pro @@ -1,6 +1,6 @@ load(qttest_p4) TEMPLATE = app -TARGET = tst_qregion +TARGET = tst_bench_qregion DEPENDPATH += . INCLUDEPATH += . diff --git a/tests/benchmarks/gui/painting/qtransform/qtransform.pro b/tests/benchmarks/gui/painting/qtransform/qtransform.pro index 8d87656..dc60407 100644 --- a/tests/benchmarks/gui/painting/qtransform/qtransform.pro +++ b/tests/benchmarks/gui/painting/qtransform/qtransform.pro @@ -1,6 +1,6 @@ load(qttest_p4) TEMPLATE = app -TARGET = tst_qtransform +TARGET = tst_bench_qtransform SOURCES += tst_qtransform.cpp |