diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 20:29:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 20:29:20 (GMT) |
| commit | c46c06d363b7c90fecd84e7ef333ffa449f1d71c (patch) | |
| tree | 17462ee1282075a748fa84ca0a0feca3e2c588a0 | |
| parent | 766791963b91bea53867381f04f72d356382a81b (diff) | |
| parent | ef84739c3737d03da9de2b5e92a68f70294c65d3 (diff) | |
| download | Qt-c46c06d363b7c90fecd84e7ef333ffa449f1d71c.zip Qt-c46c06d363b7c90fecd84e7ef333ffa449f1d71c.tar.gz Qt-c46c06d363b7c90fecd84e7ef333ffa449f1d71c.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 qmake.pro after Symbian alternate build system integration
Fix compile error
Don't try to use so much permissions, use something a lot more sane
A bit saner suggestion
Remove not needed permissions
Make compile on Symbian
| -rw-r--r-- | demos/declarative/minehunt/minehunt.pro | 1 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 2 | ||||
| -rw-r--r-- | examples/network/fortuneserver/fortuneserver.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qchar/qchar.pro | 6 | ||||
| -rw-r--r-- | tests/auto/qchar/tst_qchar.cpp | 5 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 2 |
6 files changed, 9 insertions, 9 deletions
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 \ 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] 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 } 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); diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 13b01f2..bc6d032 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" } |