diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-20 13:58:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-20 13:58:44 (GMT) |
| commit | 8678d9b5e70f6076e1e915d8bf3938136fe4018c (patch) | |
| tree | dcee95334a1abf4ed9946a3f195d7ccd0dbbaa06 /tests | |
| parent | 10ae8560f03c0e70e77420accf5233dee36c5b67 (diff) | |
| parent | 2feb893547a19534613c434fccbb0cdc8eba6cdb (diff) | |
| download | Qt-8678d9b5e70f6076e1e915d8bf3938136fe4018c.zip Qt-8678d9b5e70f6076e1e915d8bf3938136fe4018c.tar.gz Qt-8678d9b5e70f6076e1e915d8bf3938136fe4018c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added missing deployment to autotest.
Fixed some deployment issues on Symbian.
Fixed a QSplashScreen hanging bug in S60 3.1 devices.
Diffstat (limited to 'tests')
| -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 |