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:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/examples/help/contextsensitivehelp/contextsensitivehelp.pro

    r2 r561  
    1717sources.path = $$[QT_INSTALL_EXAMPLES]/help/contextsensitivehelp
    1818INSTALLS += target sources
     19
     20symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)

  • trunk/examples/help/contextsensitivehelp/doc/source.html

    r2 r561  
    55    </head>
    66    <body>
    7         The current pipe system connects to four different sources. Be aware that only
    8         a limited amount of water can be taken from some sources.
     7        The current pipe system connects to four different sources. Be aware
     8        that only a limited amount of water can be taken from some sources.
    99        <br>
    1010        <table border=1>
    … …  
    1414            </tr>
    1515            <tr>
    16                 <td>Foundain</td>
     16                <td>Fountain</td>
    1717                <td>4000</td>
    1818            </tr>

  • trunk/examples/help/contextsensitivehelp/doc/wateringmachine.qhp

    r2 r561  
    1 <?xml version="1.0" encoding="utf-8" ?> 
     1<?xml version="1.0" encoding="utf-8" ?>
    22<QtHelpProject version="1.0">
    3         <virtualFolder>wateringmachine</virtualFolder>
    4         <namespace>wateringcompany.com.1_0_0.premium</namespace>
    5         <filterSection>
    6                 <keywords>
    7                         <keyword name="plants" id="plants" ref="plants.html"/>
    8                         <keyword name="temperature" id="temperature" ref="temperature.html"/>
    9                         <keyword name="rain" id="rain" ref="rain.html"/>
    10                         <keyword name="time" id="time" ref="time.html"/>
    11                         <keyword name="amount" id="amount" ref="amount.html"/>
    12                         <keyword name="source" id="source" ref="source.html"/>
    13                         <keyword name="filtering" id="filtering" ref="filter.html"/>
    14                 </keywords>     
    15                 <files>
    16                         <file>plants.html</file>
    17                         <file>temperature.html</file>
    18                         <file>rain.html</file>
    19                         <file>time.html</file>
    20                         <file>amount.html</file>
    21                         <file>source.html</file>
    22                         <file>filter.html</file>
    23                 </files>
    24         </filterSection>       
     3    <virtualFolder>wateringmachine</virtualFolder>
     4    <namespace>wateringcompany.com.1-0-0.premium</namespace>
     5    <filterSection>
     6        <keywords>
     7            <keyword name="plants" id="plants" ref="plants.html"/>
     8            <keyword name="temperature" id="temperature" ref="temperature.html"/>
     9            <keyword name="rain" id="rain" ref="rain.html"/>
     10            <keyword name="time" id="time" ref="time.html"/>
     11            <keyword name="amount" id="amount" ref="amount.html"/>
     12            <keyword name="source" id="source" ref="source.html"/>
     13            <keyword name="filtering" id="filtering" ref="filter.html"/>
     14        </keywords>
     15        <files>
     16            <file>plants.html</file>
     17            <file>temperature.html</file>
     18            <file>rain.html</file>
     19            <file>time.html</file>
     20            <file>amount.html</file>
     21            <file>source.html</file>
     22            <file>filter.html</file>
     23        </files>
     24    </filterSection>
    2525</QtHelpProject>

  • trunk/examples/help/contextsensitivehelp/helpbrowser.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/help/contextsensitivehelp/helpbrowser.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/help/contextsensitivehelp/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/help/contextsensitivehelp/wateringconfigdialog.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    m_widgetInfo.insert(m_ui.filterCheckBox, tr("water filtering"));
    5656
    57     connect(qApp, SIGNAL(focusChanged(QWidget*, QWidget*)),
    58         this, SLOT(focusChanged(QWidget*, QWidget*)));
     57    connect(qApp, SIGNAL(focusChanged(QWidget*,QWidget*)),
     58        this, SLOT(focusChanged(QWidget*,QWidget*)));
    5959}
    6060

  • trunk/examples/help/contextsensitivehelp/wateringconfigdialog.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/help/contextsensitivehelp/wateringconfigdialog.ui

    r2 r561  
    259259       <item>
    260260        <property name="text" >
    261          <string>Foundain</string>
     261         <string>Fountain</string>
    262262        </property>
    263263       </item>
Note: See TracChangeset for help on using the changeset viewer.