diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 15:47:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 15:47:12 (GMT) |
| commit | 2e29f107476428bba4aad5c2d56a2a19921931dc (patch) | |
| tree | a8a3f936a6535cea08a5f13cdeecba2c8b80f580 /tests | |
| parent | 8529a50aba22d5b522852b6bd99de5720070e665 (diff) | |
| parent | 8e86df43cbc54b740a8aa5f950a5811ac25b9539 (diff) | |
| download | Qt-2e29f107476428bba4aad5c2d56a2a19921931dc.zip Qt-2e29f107476428bba4aad5c2d56a2a19921931dc.tar.gz Qt-2e29f107476428bba4aad5c2d56a2a19921931dc.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:
Removed unnecessary data_caging_paths.prf loading from applications
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qtextstream/test/test.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro index c70c27b..20823de 100644 --- a/tests/auto/qtextstream/test/test.pro +++ b/tests/auto/qtextstream/test/test.pro @@ -28,7 +28,6 @@ wince*|symbian: { wince*: { DEFINES += SRCDIR=\\\"\\\" }else:symbian { - load(data_caging_paths) # Symbian can't define SRCDIR meaningfully here qt_not_deployed { codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll |