diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-29 10:06:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-29 10:06:33 (GMT) |
| commit | 11468d1086315c2d4f77f3747488e423d499bf56 (patch) | |
| tree | 4ee4c62b9de4f4810972f065b77537c8126384fa /tests/auto/qpixmap | |
| parent | dbaaece5f5e27503b3b6703265f2b2bd63147b82 (diff) | |
| parent | 84294f47e55073914bcbcdbaf85df1a0e2e2d845 (diff) | |
| download | Qt-11468d1086315c2d4f77f3747488e423d499bf56.zip Qt-11468d1086315c2d4f77f3747488e423d499bf56.tar.gz Qt-11468d1086315c2d4f77f3747488e423d499bf56.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (407 commits)
Cherry pick fix for MOBILITY-1234 from Qt Mobility.
Cherry pick fix for QTMOBILITY-408 from Qt Mobility.
Cherry pick fix for MOBILITY-1194 from Qt Mobility.
Fix compilation error on Symbian^4.
Fix detection of OCC functionality.
Cherry pick fix for MOBILITY-1194 from Qt Mobility.
Fix signal emission of QDesktopWidget on Symbian.
Don't run the QGL test on systems that does not have GL support.
Adding missing image
Fixed gcce linker error when linking against s60main built by armcc.
Make it possible again to build Qt without webkit
Fixed plugin build key for Symbian builds under Linux.
Remove an useless assert from comp_func_SourceOver_sse2()
QScriptEngineAgent: recompile all the function when installing a debugger.
QScriptDeclarativeObject: we need to save the current stack pointer.
QScriptValue::objectId(): do not assert if the value is not a cell
Implement the composition mode "Plus" with SSE2
Clean the CompositionFunction tables of drawhelper
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
...
Diffstat (limited to 'tests/auto/qpixmap')
| -rw-r--r-- | tests/auto/qpixmap/qpixmap.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro index c3ee192..ff8258f 100644 --- a/tests/auto/qpixmap/qpixmap.pro +++ b/tests/auto/qpixmap/qpixmap.pro @@ -12,14 +12,16 @@ wince*|symbian: { icons.sources = convertFromToHICON/* icons.path = convertFromToHICON - DEPLOYMENT += task31722_0 task31722_1 icons - DEPLOYMENT_PLUGIN += qico + loadFromData.sources = loadFromData/* + loadFromData.path = loadFromData + + DEPLOYMENT += task31722_0 task31722_1 icons loadFromData } wince*: { DEFINES += SRCDIR=\\\".\\\" + DEPLOYMENT_PLUGIN += qico } else:symbian { - DEPLOYMENT_PLUGIN += qmng LIBS += -lfbscli.dll -lbitgdi.dll -lgdi.dll contains(QT_CONFIG, openvg) { LIBS += $$QMAKE_LIBS_OPENVG |