diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-23 06:15:09 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-23 06:15:09 (GMT) |
| commit | 73a3cd8f4448bb6ffcdb2076dcba2afa7a0e893b (patch) | |
| tree | 4e3e8a7e296709ef0210b002f8ed6e12f3d75d2a | |
| parent | a60f8832425aafbe6c5e8be3c25fefc9f8f2f87b (diff) | |
| parent | e53cd1a6c32e2de719e82a1e0f25b104a0fee995 (diff) | |
| download | Qt-73a3cd8f4448bb6ffcdb2076dcba2afa7a0e893b.zip Qt-73a3cd8f4448bb6ffcdb2076dcba2afa7a0e893b.tar.gz Qt-73a3cd8f4448bb6ffcdb2076dcba2afa7a0e893b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/plugins/bearer/symbian/symbian_3/symbian_3.pro | 1 | ||||
| -rw-r--r-- | tools/linguist/lupdate/qdeclarative.cpp | 16 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro index f9d486e..804986a 100644 --- a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro +++ b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro @@ -7,6 +7,7 @@ exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) { exists($$MW_LAYER_PUBLIC_EXPORT_PATH(extendedconnpref.h)) { DEFINES += OCC_FUNCTIONALITY_AVAILABLE + LIBS += -lextendedconnpref } } else { # Fall back to 3_1 implementation on platforms that do not have cmmanager diff --git a/tools/linguist/lupdate/qdeclarative.cpp b/tools/linguist/lupdate/qdeclarative.cpp index a734e99..1b35c14 100644 --- a/tools/linguist/lupdate/qdeclarative.cpp +++ b/tools/linguist/lupdate/qdeclarative.cpp @@ -102,12 +102,8 @@ protected: comment = literal->value->asString(); AST::ArgumentList *nNode = commentNode->next; - if (nNode) { - AST::NumericLiteral *numLiteral = AST::cast<AST::NumericLiteral *>(nNode->expression); - if (numLiteral) { - plural = true; - } - } + if (nNode) + plural = true; } TranslatorMessage msg(m_component, source, @@ -135,12 +131,8 @@ protected: comment = literal->value->asString(); AST::ArgumentList *nNode = commentNode->next; - if (nNode) { - AST::NumericLiteral *numLiteral = AST::cast<AST::NumericLiteral *>(nNode->expression); - if (numLiteral) { - plural = true; - } - } + if (nNode) + plural = true; } } |