diff options
author | Topi Reinio <topi.reinio@digia.com> | 2013-10-29 14:54:20 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-30 16:56:13 +0100 |
commit | d040f2668309937be6acd2415dbfaa3f07671476 (patch) | |
tree | 7a4c46d89494f2744abb3e4ba701fa4338a01120 /examples/help/contextsensitivehelp | |
parent | c28ecbb7ed8404b7e29b1d1b30882c865d87e34d (diff) |
Doc: Rename doc directory of Context Sensitive Help example
During packaging, the doc/ directories are removed from
examples when they are copied to Qt examples install
directory.
This example has a doc/ directory with contents required
to run it. This change renames it so that he packaging
doesn't break it.
Task-number: QTBUG-33848
Change-Id: I7b4e29d7b3c2c2ff9429c1a81bd32fb809d0cdb3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'examples/help/contextsensitivehelp')
-rw-r--r-- | examples/help/contextsensitivehelp/contextsensitivehelp.pro | 2 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/amount.html (renamed from examples/help/contextsensitivehelp/doc/amount.html) | 2 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/filter.html (renamed from examples/help/contextsensitivehelp/doc/filter.html) | 0 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/plants.html (renamed from examples/help/contextsensitivehelp/doc/plants.html) | 4 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/rain.html (renamed from examples/help/contextsensitivehelp/doc/rain.html) | 4 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/source.html (renamed from examples/help/contextsensitivehelp/doc/source.html) | 0 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/temperature.html (renamed from examples/help/contextsensitivehelp/doc/temperature.html) | 2 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/time.html (renamed from examples/help/contextsensitivehelp/doc/time.html) | 0 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/wateringmachine.qch (renamed from examples/help/contextsensitivehelp/doc/wateringmachine.qch) | bin | 25600 -> 25600 bytes | |||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/wateringmachine.qhc (renamed from examples/help/contextsensitivehelp/doc/wateringmachine.qhc) | bin | 8192 -> 8192 bytes | |||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/wateringmachine.qhcp (renamed from examples/help/contextsensitivehelp/doc/wateringmachine.qhcp) | 0 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/docs/wateringmachine.qhp (renamed from examples/help/contextsensitivehelp/doc/wateringmachine.qhp) | 0 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/helpbrowser.cpp | 2 |
13 files changed, 8 insertions, 8 deletions
diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro index 7f13544e3..393576f5b 100644 --- a/examples/help/contextsensitivehelp/contextsensitivehelp.pro +++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro @@ -11,7 +11,7 @@ HEADERS += wateringconfigdialog.h \ FORMS += wateringconfigdialog.ui target.path = $$[QT_INSTALL_EXAMPLES]/help/contextsensitivehelp -docs.files += $$PWD/doc +docs.files += $$PWD/docs docs.path = $$target.path INSTALLS += target docs diff --git a/examples/help/contextsensitivehelp/doc/amount.html b/examples/help/contextsensitivehelp/docs/amount.html index 7a02a6fd5..78ab2201b 100644 --- a/examples/help/contextsensitivehelp/doc/amount.html +++ b/examples/help/contextsensitivehelp/docs/amount.html @@ -4,7 +4,7 @@ <title>Water amount</title> </head> <body> - Depending on the plant, temperature and rain fall the amount needs to be larger + Depending on the plant, temperature and rain fall the amount needs to be larger or smaller. On a really hot day without rain, the suggested <a href="plants.html">amount</a> can be increased by about 10%. </body> diff --git a/examples/help/contextsensitivehelp/doc/filter.html b/examples/help/contextsensitivehelp/docs/filter.html index 64861126d..64861126d 100644 --- a/examples/help/contextsensitivehelp/doc/filter.html +++ b/examples/help/contextsensitivehelp/docs/filter.html diff --git a/examples/help/contextsensitivehelp/doc/plants.html b/examples/help/contextsensitivehelp/docs/plants.html index 2d2bb6788..d0fd4d7bd 100644 --- a/examples/help/contextsensitivehelp/doc/plants.html +++ b/examples/help/contextsensitivehelp/docs/plants.html @@ -4,7 +4,7 @@ <title>Plants</title> </head> <body> - Different kind of plants need different amounts of water. Here's a short + Different kind of plants need different amounts of water. Here's a short overview over the most common grown plants and their avarage need of water: <br> <table border=1> @@ -38,7 +38,7 @@ </tr> </table> <br><br> - <font color="#ff0000">Warning:</font> Watering them too much or too little will + <font color="#ff0000">Warning:</font> Watering them too much or too little will cause irreversible damage! </body> </html> diff --git a/examples/help/contextsensitivehelp/doc/rain.html b/examples/help/contextsensitivehelp/docs/rain.html index 1ffe45240..09b5fa41f 100644 --- a/examples/help/contextsensitivehelp/doc/rain.html +++ b/examples/help/contextsensitivehelp/docs/rain.html @@ -4,8 +4,8 @@ <title>Rain</title> </head> <body> - Depending on the rain fall, the automated watering system should not be - switched on at all. Also, the <a href="./temperature.html">temperature</a> should be + Depending on the rain fall, the automated watering system should not be + switched on at all. Also, the <a href="./temperature.html">temperature</a> should be considered. </body> </html> diff --git a/examples/help/contextsensitivehelp/doc/source.html b/examples/help/contextsensitivehelp/docs/source.html index 68b2f8c71..68b2f8c71 100644 --- a/examples/help/contextsensitivehelp/doc/source.html +++ b/examples/help/contextsensitivehelp/docs/source.html diff --git a/examples/help/contextsensitivehelp/doc/temperature.html b/examples/help/contextsensitivehelp/docs/temperature.html index 4145ed725..92e8723b8 100644 --- a/examples/help/contextsensitivehelp/doc/temperature.html +++ b/examples/help/contextsensitivehelp/docs/temperature.html @@ -4,7 +4,7 @@ <title>Temperature</title> </head> <body> - Depending on the temperature, the plants need more or less water. The higher + Depending on the temperature, the plants need more or less water. The higher the temperature the higher the need for water. If the temperature does not reach a certain level, maybe no automatic watering should be done at all.<br> Before setting this parameter for good, you should also take the amount of <a href="./rain.html"> diff --git a/examples/help/contextsensitivehelp/doc/time.html b/examples/help/contextsensitivehelp/docs/time.html index 0cc81f4d0..0cc81f4d0 100644 --- a/examples/help/contextsensitivehelp/doc/time.html +++ b/examples/help/contextsensitivehelp/docs/time.html diff --git a/examples/help/contextsensitivehelp/doc/wateringmachine.qch b/examples/help/contextsensitivehelp/docs/wateringmachine.qch Binary files differindex 35d29be22..35d29be22 100644 --- a/examples/help/contextsensitivehelp/doc/wateringmachine.qch +++ b/examples/help/contextsensitivehelp/docs/wateringmachine.qch diff --git a/examples/help/contextsensitivehelp/doc/wateringmachine.qhc b/examples/help/contextsensitivehelp/docs/wateringmachine.qhc Binary files differindex b5653c3ff..b5653c3ff 100644 --- a/examples/help/contextsensitivehelp/doc/wateringmachine.qhc +++ b/examples/help/contextsensitivehelp/docs/wateringmachine.qhc diff --git a/examples/help/contextsensitivehelp/doc/wateringmachine.qhcp b/examples/help/contextsensitivehelp/docs/wateringmachine.qhcp index eebf6520e..eebf6520e 100644 --- a/examples/help/contextsensitivehelp/doc/wateringmachine.qhcp +++ b/examples/help/contextsensitivehelp/docs/wateringmachine.qhcp diff --git a/examples/help/contextsensitivehelp/doc/wateringmachine.qhp b/examples/help/contextsensitivehelp/docs/wateringmachine.qhp index 6dd08e7ae..6dd08e7ae 100644 --- a/examples/help/contextsensitivehelp/doc/wateringmachine.qhp +++ b/examples/help/contextsensitivehelp/docs/wateringmachine.qhp diff --git a/examples/help/contextsensitivehelp/helpbrowser.cpp b/examples/help/contextsensitivehelp/helpbrowser.cpp index f076c3c67..cbf9b21d6 100644 --- a/examples/help/contextsensitivehelp/helpbrowser.cpp +++ b/examples/help/contextsensitivehelp/helpbrowser.cpp @@ -48,7 +48,7 @@ HelpBrowser::HelpBrowser(QWidget *parent) : QTextBrowser(parent) { QString collectionFile = QLibraryInfo::location(QLibraryInfo::ExamplesPath) - + QLatin1String("/help/contextsensitivehelp/doc/wateringmachine.qhc"); + + QLatin1String("/help/contextsensitivehelp/docs/wateringmachine.qhc"); m_helpEngine = new QHelpEngineCore(collectionFile, this); if (!m_helpEngine->setupData()) { |