Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/examples/mainwindows/application/application.pro

    r2 r561  
    1111sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/application
    1212INSTALLS += target sources
     13
     14symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

  • trunk/examples/mainwindows/application/main.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5050
    5151    QApplication app(argc, argv);
     52    app.setOrganizationName("Trolltech");
     53    app.setApplicationName("Application Example");
    5254    MainWindow mainWin;
    5355    mainWin.show();

  • trunk/examples/mainwindows/application/mainwindow.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    175175//! [20]
    176176    exitAct = new QAction(tr("E&xit"), this);
    177     exitAct->setShortcut(tr("Ctrl+Q"));
     177    exitAct->setShortcuts(QKeySequence::Quit);
    178178//! [20]
    179179    exitAct->setStatusTip(tr("Exit the application"));
    … …  
    329329
    330330    QTextStream in(&file);
     331#ifndef QT_NO_CURSOR
    331332    QApplication::setOverrideCursor(Qt::WaitCursor);
     333#endif
    332334    textEdit->setPlainText(in.readAll());
     335#ifndef QT_NO_CURSOR
    333336    QApplication::restoreOverrideCursor();
     337#endif
    334338
    335339    setCurrentFile(fileName);
    … …  
    352356
    353357    QTextStream out(&file);
     358#ifndef QT_NO_CURSOR
    354359    QApplication::setOverrideCursor(Qt::WaitCursor);
     360#endif
    355361    out << textEdit->toPlainText();
     362#ifndef QT_NO_CURSOR
    356363    QApplication::restoreOverrideCursor();
     364#endif
    357365
    358366    setCurrentFile(fileName);
    … …  
    370378    setWindowModified(false);
    371379
    372     QString shownName;
     380    QString shownName = curFile;
    373381    if (curFile.isEmpty())
    374382        shownName = "untitled.txt";
    375     else
    376         shownName = strippedName(curFile);
    377 
    378     setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application")));
     383    setWindowFilePath(shownName);
    379384}
    380385//! [47]

  • trunk/examples/mainwindows/application/mainwindow.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/dockwidgets/dockwidgets.pro

    r2 r561  
    99sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/dockwidgets
    1010INSTALLS += target sources
     11
     12symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

  • trunk/examples/mainwindows/dockwidgets/main.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/dockwidgets/mainwindow.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    243243
    244244    quitAct = new QAction(tr("&Quit"), this);
    245     quitAct->setShortcut(tr("Ctrl+Q"));
     245    quitAct->setShortcuts(QKeySequence::Quit);
    246246    quitAct->setStatusTip(tr("Quit the application"));
    247247    connect(quitAct, SIGNAL(triggered()), this, SLOT(close()));
    … …  
    336336    viewMenu->addAction(dock->toggleViewAction());
    337337
    338     connect(customerList, SIGNAL(currentTextChanged(const QString &)),
    339             this, SLOT(insertCustomer(const QString &)));
    340     connect(paragraphsList, SIGNAL(currentTextChanged(const QString &)),
    341             this, SLOT(addParagraph(const QString &)));
     338    connect(customerList, SIGNAL(currentTextChanged(QString)),
     339            this, SLOT(insertCustomer(QString)));
     340    connect(paragraphsList, SIGNAL(currentTextChanged(QString)),
     341            this, SLOT(addParagraph(QString)));
    342342}
    343343//! [9]

  • trunk/examples/mainwindows/dockwidgets/mainwindow.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/mainwindows.pro

    r2 r561  
    77                sdi
    88
     9symbian: SUBDIRS = \
     10                menus
     11
     12
    913# install
    1014target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows
    … …  
    1216sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows
    1317INSTALLS += target sources
     18
     19symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

  • trunk/examples/mainwindows/mdi/main.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/mdi/mainwindow.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5151    mdiArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
    5252    setCentralWidget(mdiArea);
    53     connect(mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow *)),
     53    connect(mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow*)),
    5454            this, SLOT(updateMenus()));
    5555    windowMapper = new QSignalMapper(this);
    56     connect(windowMapper, SIGNAL(mapped(QWidget *)),
    57             this, SLOT(setActiveSubWindow(QWidget *)));
     56    connect(windowMapper, SIGNAL(mapped(QWidget*)),
     57            this, SLOT(setActiveSubWindow(QWidget*)));
    5858
    5959    createActions();
    … …  
    7272{
    7373    mdiArea->closeAllSubWindows();
    74     if (activeMdiChild()) {
     74    if (mdiArea->currentSubWindow()) {
    7575        event->ignore();
    7676    } else {
    … …  
    236236//! [0]
    237237    exitAct = new QAction(tr("E&xit"), this);
    238     exitAct->setShortcut(tr("Ctrl+Q"));
     238    exitAct->setShortcuts(QKeySequence::Quit);
    239239    exitAct->setStatusTip(tr("Exit the application"));
    240240    connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
    … …  
    260260
    261261    closeAct = new QAction(tr("Cl&ose"), this);
    262     closeAct->setShortcut(tr("Ctrl+F4"));
    263262    closeAct->setStatusTip(tr("Close the active window"));
    264263    connect(closeAct, SIGNAL(triggered()),

  • trunk/examples/mainwindows/mdi/mainwindow.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/mdi/mdi.pro

    r2 r561  
    1111sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/mdi
    1212INSTALLS += target sources
     13
     14symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

  • trunk/examples/mainwindows/mdi/mdichild.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/mdi/mdichild.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/menus/main.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/menus/mainwindow.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    220220
    221221    exitAct = new QAction(tr("E&xit"), this);
    222     exitAct->setShortcut(tr("Ctrl+Q"));
     222    exitAct->setShortcuts(QKeySequence::Quit);
    223223    exitAct->setStatusTip(tr("Exit the application"));
    224224    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
    … …  
    241241
    242242    copyAct = new QAction(tr("&Copy"), this);
    243     copyAct->setShortcut(tr("Ctrl+C"));
     243    copyAct->setShortcuts(QKeySequence::Copy);
    244244    copyAct->setStatusTip(tr("Copy the current selection's contents to the "
    245245                             "clipboard"));
    … …  
    254254    boldAct = new QAction(tr("&Bold"), this);
    255255    boldAct->setCheckable(true);
    256     boldAct->setShortcut(tr("Ctrl+B"));
     256    boldAct->setShortcut(QKeySequence::Bold);
    257257    boldAct->setStatusTip(tr("Make the text bold"));
    258258    connect(boldAct, SIGNAL(triggered()), this, SLOT(bold()));
    … …  
    264264    italicAct = new QAction(tr("&Italic"), this);
    265265    italicAct->setCheckable(true);
    266     italicAct->setShortcut(tr("Ctrl+I"));
     266    italicAct->setShortcut(QKeySequence::Italic);
    267267    italicAct->setStatusTip(tr("Make the text italic"));
    268268    connect(italicAct, SIGNAL(triggered()), this, SLOT(italic()));

  • trunk/examples/mainwindows/menus/mainwindow.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/menus/menus.pro

    r2 r561  
    88sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/menus
    99INSTALLS += target sources
     10
     11symbian {
     12    TARGET.UID3 = 0xA000CF66
     13    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     14}

  • trunk/examples/mainwindows/recentfiles/main.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4747{
    4848    QApplication app(argc, argv);
     49    app.setOrganizationName("Trolltech");
     50    app.setApplicationName("Recent Files Example");
    4951    MainWindow *mainWin = new MainWindow;
    5052    mainWin->show();

  • trunk/examples/mainwindows/recentfiles/mainwindow.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5555    (void)statusBar();
    5656
    57     setWindowTitle(tr("Recent Files"));
     57    setWindowFilePath(QString());
    5858    resize(400, 300);
    5959}
    … …  
    133133
    134134    exitAct = new QAction(tr("E&xit"), this);
    135     exitAct->setShortcut(tr("Ctrl+Q"));
     135    exitAct->setShortcuts(QKeySequence::Quit);
    136136    exitAct->setStatusTip(tr("Exit the application"));
    137137    connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
    … …  
    210210{
    211211    curFile = fileName;
    212     if (curFile.isEmpty())
    213         setWindowTitle(tr("Recent Files"));
    214     else
    215         setWindowTitle(tr("%1 - %2").arg(strippedName(curFile))
    216                                     .arg(tr("Recent Files")));
    217 
    218     QSettings settings("Trolltech", "Recent Files Example");
     212    setWindowFilePath(curFile);
     213
     214    QSettings settings;
    219215    QStringList files = settings.value("recentFileList").toStringList();
    220216    files.removeAll(fileName);
    … …  
    234230void MainWindow::updateRecentFileActions()
    235231{
    236     QSettings settings("Trolltech", "Recent Files Example");
     232    QSettings settings;
    237233    QStringList files = settings.value("recentFileList").toStringList();
    238234

  • trunk/examples/mainwindows/recentfiles/mainwindow.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/mainwindows/recentfiles/recentfiles.pro

    r2 r561  
    88sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/recentfiles
    99INSTALLS += target sources
     10
     11symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

  • trunk/examples/mainwindows/sdi/main.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4848    Q_INIT_RESOURCE(sdi);
    4949    QApplication app(argc, argv);
     50    app.setApplicationName("SDI Example");
     51    app.setOrganizationName("Trolltech");
    5052    MainWindow *mainWin = new MainWindow;
    5153    mainWin->show();

  • trunk/examples/mainwindows/sdi/mainwindow.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    181181
    182182    exitAct = new QAction(tr("E&xit"), this);
    183     exitAct->setShortcut(tr("Ctrl+Q"));
     183    exitAct->setShortcuts(QKeySequence::Quit);
    184184    exitAct->setStatusTip(tr("Exit the application"));
    185185    connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
    … …  
    267267void MainWindow::readSettings()
    268268{
    269     QSettings settings("Trolltech", "SDI Example");
     269    QSettings settings;
    270270    QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
    271271    QSize size = settings.value("size", QSize(400, 400)).toSize();
    … …  
    276276void MainWindow::writeSettings()
    277277{
    278     QSettings settings("Trolltech", "SDI Example");
     278    QSettings settings;
    279279    settings.setValue("pos", pos());
    280280    settings.setValue("size", size());
    … …  
    353353    textEdit->document()->setModified(false);
    354354    setWindowModified(false);
    355 
    356     setWindowTitle(tr("%1[*] - %2").arg(strippedName(curFile))
    357                                        .arg(tr("SDI")));
     355    setWindowFilePath(curFile);
    358356}
    359357

  • trunk/examples/mainwindows/sdi/mainwindow.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5151QT_END_NAMESPACE
    5252
     53//! [class definition with macro]
    5354class MainWindow : public QMainWindow
    5455{
    … …  
    5758public:
    5859    MainWindow();
     60//! [class definition with macro]
    5961    MainWindow(const QString &fileName);
    6062

  • trunk/examples/mainwindows/sdi/sdi.pro

    r2 r561  
    99sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/sdi
    1010INSTALLS += target sources
     11
     12symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
Note: See TracChangeset for help on using the changeset viewer.