From 5a65de743d2c4673e97b43411d1b8f185b5ddc15 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Mon, 12 Apr 2010 14:07:09 +0200 Subject: Make compile on Symbian --- tools/qml/qml.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index ba283b6..ebf5366 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -53,8 +53,8 @@ QT += scripttools \ symbian { # TARGET.UID3 = include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h LIBS += -lesock -lcommdb -lconnmon -linsock TARGET.CAPABILITY = "All -TCB" } -- cgit v0.12 From e0e1c313bf332d180bca8fed033f4be46fadf1e7 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Mon, 12 Apr 2010 17:30:59 +0200 Subject: Remove not needed permissions --- demos/declarative/minehunt/minehunt.pro | 1 - 1 file changed, 1 deletion(-) diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index 7b18bfb..8a5667d 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -25,7 +25,6 @@ INSTALLS = sources MinehuntCore_sources target symbian:{ load(data_caging_paths) TARGET.EPOCALLOWDLLDATA = 1 - TARGET.CAPABILITY = all -tcb include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) importFiles.sources = minehunt.dll \ -- cgit v0.12 From af36df4d9f1d000595cfc0dc04c2c0b7163c19a1 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Mon, 12 Apr 2010 17:31:21 +0200 Subject: A bit saner suggestion The docs should probably not suggest a permission level has so many permissions that in practice nobody needs it (or can get it) --- doc/src/snippets/code/doc_src_qmake-manual.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index d9e5d3c..5789662 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -886,7 +886,7 @@ TARGET.CAPABILITY += AllFiles //! [133] //! [134] -TARGET.CAPABILITY = ALL -TCB +TARGET.CAPABILITY = ALL -TCB -DRM -AllFiles //! [134] //! [135] -- cgit v0.12 From 29d88ba7a69df310150bbeab78d07e6186304565 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Mon, 12 Apr 2010 17:47:07 +0200 Subject: Don't try to use so much permissions, use something a lot more sane --- examples/network/fortuneserver/fortuneserver.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro index 29ba313..474ec11 100644 --- a/examples/network/fortuneserver/fortuneserver.pro +++ b/examples/network/fortuneserver/fortuneserver.pro @@ -14,6 +14,6 @@ symbian { include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ LIBS += -lesock -lcommdb -linsock # For IAP selection - TARGET.CAPABILITY = "All -TCB" + TARGET.CAPABILITY = "NetworkServices ReadUserData" TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } -- cgit v0.12 From a24921ff976a07cc36c0f2edd78894d5d033938e Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Mon, 12 Apr 2010 19:59:31 +0200 Subject: Fix compile error Reviewed-by: Jason Barron --- tests/auto/qchar/qchar.pro | 6 +++++- tests/auto/qchar/tst_qchar.cpp | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/qchar/qchar.pro index 0a3fcc3..a534d14 100644 --- a/tests/auto/qchar/qchar.pro +++ b/tests/auto/qchar/qchar.pro @@ -8,4 +8,8 @@ deploy.sources += NormalizationTest.txt DEPLOYMENT = deploy } -DEFINES += SRCDIR=\\\"$$PWD/\\\" +symbian*: { + DEFINES += SRCDIR="" +} else { + DEFINES += SRCDIR=\\\"$$PWD/\\\" +} diff --git a/tests/auto/qchar/tst_qchar.cpp b/tests/auto/qchar/tst_qchar.cpp index 6227c2e..5ca2255 100644 --- a/tests/auto/qchar/tst_qchar.cpp +++ b/tests/auto/qchar/tst_qchar.cpp @@ -513,10 +513,7 @@ void tst_QChar::normalization() } QFile f(SRCDIR "NormalizationTest.txt"); - if (!f.exists()) { - QFAIL("Couldn't find NormalizationTest.txt"); - return; - } + QVERIFY(f.exists()); f.open(QIODevice::ReadOnly); -- cgit v0.12 From a036df97b0f66a8bf57171c5725becf2d2b6467b Mon Sep 17 00:00:00 2001 From: Iain Date: Tue, 13 Apr 2010 10:40:35 +0200 Subject: Fix qmake.pro after Symbian alternate build system integration Symbian makefile build system integration forgot to update qmake.pro Reviewed-by: Marius Storm-Olsen --- qmake/qmake.pri | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 0821f00..281417c 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -14,6 +14,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \ generators/win32/msvc_vcproj.cpp \ generators/win32/msvc_objectmodel.cpp \ + generators/symbian/symbiancommon.cpp \ generators/symbian/symmake.cpp \ generators/symbian/symmake_abld.cpp \ generators/symbian/symmake_sbsv2.cpp \ @@ -28,6 +29,7 @@ HEADERS += project.h property.h generators/makefile.h \ generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \ generators/win32/msvc_vcproj.h \ generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \ + generators/symbian/symbiancommon.h \ generators/symbian/symmake.h \ generators/symbian/symmake_abld.h \ generators/symbian/symmake_sbsv2.h \ -- cgit v0.12