From 469363cd360b37e5873713055797b726fd6480df Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 8 Jun 2010 23:46:30 +0200 Subject: Fix the Qt application icon on Symbian It simply did not have the required (and square) dimensions as Symbian icons need to have. Therefore it looked odd, in different ways on different Symbian flavours. On Symbian^3, it was even distorted. Task-number: QTBUG-4786 Reviewed-by: trustme --- src/s60installs/qt.svg | 106 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 91 insertions(+), 15 deletions(-) diff --git a/src/s60installs/qt.svg b/src/s60installs/qt.svg index 6230ada..566acfa 100644 --- a/src/s60installs/qt.svg +++ b/src/s60installs/qt.svg @@ -1,17 +1,93 @@ - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + + + + + + + + + -- cgit v0.12 From 6e2bc8975dc940832e9a0765181b117c2e319855 Mon Sep 17 00:00:00 2001 From: Toby Tomkins Date: Wed, 9 Jun 2010 10:44:23 +1000 Subject: Fixed compilation for solaris based compilers, macro doesn't require trailing semicolon. Reviewed-by: Rohan McGovern --- tools/linguist/lupdate/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index 1715b79..5550aa2 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -63,7 +63,7 @@ static void printOut(const QString & out) } class LU { - Q_DECLARE_TR_FUNCTIONS(LUpdate); + Q_DECLARE_TR_FUNCTIONS(LUpdate) }; static void recursiveFileInfoList(const QDir &dir, -- cgit v0.12 From 82bd909140fc2bd0dc53ff024bb72bd0a3b342e2 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 9 Jun 2010 16:31:24 +1000 Subject: Fixed qdoc3 crash. Fixes "Invalid read of size 4" reported by valgrind. --- tools/qdoc3/node.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index 4ba3a32..3c7e9dc 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -624,7 +624,7 @@ void InnerNode::removeChild(Node *child) QMap::Iterator prim = primaryFunctionMap.find(child->name()); NodeList& secs = secondaryFunctionMap[child->name()]; - if (*prim == child) { + if (prim != primaryFunctionMap.end() && *prim == child) { if (secs.isEmpty()) { primaryFunctionMap.remove(child->name()); } @@ -636,12 +636,12 @@ void InnerNode::removeChild(Node *child) secs.removeAll(child); } QMap::Iterator ent = childMap.find( child->name() ); - if ( *ent == child ) + if (ent != childMap.end() && *ent == child) childMap.erase( ent ); } else { QMap::Iterator ent = childMap.find(child->name()); - if (*ent == child) + if (ent != childMap.end() && *ent == child) childMap.erase(ent); } } -- cgit v0.12 From ce99e07ec9e9805864d38eea076d1efa0c20b213 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 9 Jun 2010 15:58:38 +0300 Subject: Fixed DEPLOYMENT variable check in sis_targets.prf Checking just for count can fail when default_deployment is replaced with single custom deployment item. Reviewed-by: Janne Koskinen --- mkspecs/features/sis_targets.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index 13ee1ad..0023b54 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -1,5 +1,5 @@ # Sis file creation -contains(TEMPLATE, app)|!count(DEPLOYMENT, 1) { +contains(TEMPLATE, app)|!equals(DEPLOYMENT, default_deployment) { symbian-abld|symbian-sbsv2 { sis_destdir = make_cache_name = .make.cache -- cgit v0.12 From b1892130920981c099fc1800ef365cf4643c3382 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 9 Jun 2010 15:27:54 +0200 Subject: Fix Symbian install path for Qml plugins We force it to c: just as we do with all other Qt plugins Reviewed-by: Miikka Heikkinen --- src/s60installs/s60installs.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index d3d9eed..d751134 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -159,16 +159,16 @@ symbian: { gesturesImport.sources += $$QT_SOURCE_TREE/src/imports/gestures/qmldir particlesImport.sources += $$QT_SOURCE_TREE/src/imports/particles/qmldir - folderlistmodelImport.path = $$QT_IMPORTS_BASE_DIR/Qt/labs/folderlistmodel - gesturesImport.path = $$QT_IMPORTS_BASE_DIR/Qt/labs/gestures - particlesImport.path = $$QT_IMPORTS_BASE_DIR/Qt/labs/particles + folderlistmodelImport.path = c:$$QT_IMPORTS_BASE_DIR/Qt/labs/folderlistmodel + gesturesImport.path = c:$$QT_IMPORTS_BASE_DIR/Qt/labs/gestures + particlesImport.path = c:$$QT_IMPORTS_BASE_DIR/Qt/labs/particles DEPLOYMENT += folderlistmodelImport gesturesImport particlesImport contains(QT_CONFIG, webkit): { webkitImport.sources = $$QT_BUILD_TREE/imports/org/webkit/qmlwebkitplugin$${QT_LIBINFIX}.dll webkitImport.sources += $$QT_SOURCE_TREE/src/imports/webkit/qmldir - webkitImport.path = $$QT_IMPORTS_BASE_DIR/org/webkit + webkitImport.path = c:$$QT_IMPORTS_BASE_DIR/org/webkit DEPLOYMENT += webkitImport } } -- cgit v0.12