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

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • 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>
Note: See TracChangeset for help on using the changeset viewer.