diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 01:09:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 01:09:43 (GMT) |
| commit | 27f8facfea87d7c4669852e7aa0fe5d9ca828eb3 (patch) | |
| tree | 5635d4876571b5f84905cc9ff3e97138061f0c06 /examples | |
| parent | ac27c8ad39a9646a9e509ba7a58f75eeae10bb6e (diff) | |
| parent | e3696e62e54959f1a2ea71d38c4c5c04750ec743 (diff) | |
| download | Qt-27f8facfea87d7c4669852e7aa0fe5d9ca828eb3.zip Qt-27f8facfea87d7c4669852e7aa0fe5d9ca828eb3.tar.gz Qt-27f8facfea87d7c4669852e7aa0fe5d9ca828eb3.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:
Fix build error in QtGui armv5 udeb
Updated qtbench to build against modified QStaticText API
Make compiling / linking a non-qt app work too on symbian/gcce
When on Symbian use smaller files.
Fixing the missing "\\"
The cmd line arguments have not been delegated properly.
Clear QFontCache TLS content before nullifying TLS pointer.
Add --download option to runonphone
Implement download support to TRK Launcher
Fix library creation on symbian/gcce
Update Symbian def files for 4.7
Various fixes for symbian/gcce building.
Make encoding clear
Fix 'make sis' working on symbian makefile based system again.
Make shipped symbian scripts available from the build-dir bin dir.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/network/qftp/sym_iap_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/qftp/sym_iap_util.h b/examples/network/qftp/sym_iap_util.h index 445036a..f23d82f 100644 --- a/examples/network/qftp/sym_iap_util.h +++ b/examples/network/qftp/sym_iap_util.h @@ -60,7 +60,7 @@ //#include <QTextCodec> _LIT(KIapNameSetting, "IAP\\Name"); // text - mandatory -_LIT(KIapTableIdField, "IAP\Id"); +_LIT(KIapTableIdField, "IAP\\Id"); _LIT(KIapDialogPref, "IAP\\DialogPref"); // TUnit32 - optional _LIT(KIapService, "IAP\\IAPService"); // TUnit32 - mandatory _LIT(KIapServiceType, "IAP\\IAPServiceType"); // text - mandatory |