diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 16:33:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 16:33:42 (GMT) |
| commit | 857cbe43a105617f2ac48e356c31845097e15b84 (patch) | |
| tree | a575c9cb831a0342b47cf69e245b58e895a1308b /tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro | |
| parent | 2268c602cacc7efe5fa54dd026d1c3455ec76c47 (diff) | |
| parent | d6203cfeb0e096575c1fc0254dddc07a3d65d24c (diff) | |
| download | Qt-857cbe43a105617f2ac48e356c31845097e15b84.zip Qt-857cbe43a105617f2ac48e356c31845097e15b84.tar.gz Qt-857cbe43a105617f2ac48e356c31845097e15b84.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Do check after all if we have partialUpdateSupport.
QDeclarativeEngineDebugServer: Fix crash when trying to update non-properties.
Doc: use const& in foreach when applicable.
QGLBuffer::bind()/release() should not be const functions.
Use SSSE3 to convert from RGB888 to RGB32
Extend the build system to SSSE3
CPU feature detection for x86_64
Use the appropriate CPUID bitmap for detecting SSE3 etc
Skip tst_QLineEdit::QTBUG697_paletteCurrentColorGroup on non-x11
Stabilize tst_qlineedit.cpp
QScriptEngineAgent: ensure that the top of the backtrace is correct in exceptionThrow
Fix QLineEdit's Highlight color when inactive.
Diffstat (limited to 'tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro')
| -rw-r--r-- | tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro new file mode 100644 index 0000000..ec50d98 --- /dev/null +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro @@ -0,0 +1,10 @@ +load(qttest_p4) +TEMPLATE = app +TARGET = tst_bench_imageConversion + +SOURCES += tst_qimageconversion.cpp + +!contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF +!contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG +!contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG +!contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF |