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 #n16'>16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 
/****************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file.  Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights.  These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

//! [0]
int ret = QMessageBox::warning(this, tr("My Application"),
                               tr("The document has been modified.\n"
                                  "Do you want to save your changes?"),
                               QMessageBox::Save | QMessageBox::Discard
                               | QMessageBox::Cancel,
                               QMessageBox::Save);
//! [0]


//! [1]
QMessageBox msgBox;
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
switch (msgBox.exec()) {
case QMessageBox::Yes:
    // yes was clicked
    break;
case QMessageBox::No:
    // no was clicked
    break;
default:
    // should never be reached
    break;
}
//! [1]


//! [2]
QMessageBox msgBox;
QPushButton *connectButton = msgBox.addButton(tr("Connect"), QMessageBox::ActionRole);
QPushButton *abortButton = msgBox.addButton(QMessageBox::Abort);

msgBox.exec();

if (msgBox.clickedButton() == connectButton) {
    // connect
} else if (msgBox.clickedButton() == abortButton) {
    // abort
}
//! [2]


//! [3]
QMessageBox messageBox(this);
QAbstractButton *disconnectButton =
      messageBox.addButton(tr("Disconnect"), QMessageBox::ActionRole);
...
messageBox.exec();
if (messageBox.clickedButton() == disconnectButton) {
    ...
}
//! [3]


//! [4]
#include <QApplication>
#include <QMessageBox>

int main(int argc, char *argv[])
{
    QT_REQUIRE_VERSION(argc, argv, "4.0.2")

    QApplication app(argc, argv);
    ...
    return app.exec();
}
//! [4]

//! [5]
QMessageBox msgBox;
msgBox.setText("The document has been modified.");
msgBox.exec();
//! [5]

//! [6]
QMessageBox msgBox;
msgBox.setText("The document has been modified.");
msgBox.setInformativeText("Do you want to save your changes?");
msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Save);
int ret = msgBox.exec();
//! [6]

//! [7]
switch (ret) {
  case QMessageBox::Save:
      // Save was clicked
      break;
  case QMessageBox::Discard:
      // Don't Save was clicked
      break;
  case QMessageBox::Cancel:
      // Cancel was clicked
      break;
  default:
      // should never be reached
      break;
}
//! [7]

//! [9]
QMessageBox msgBox(this);
msgBox.setText(tr("The document has been modified.\n"
                  "Do you want to save your changes?"));
msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard
                          | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Save);
//! [9]
generated by cgit v0.12 at 2025-08-18 18:34:34 (GMT)