Skip to content

Commit 72bc26e

Browse files
committed
Fixed bad server help generation
1 parent 60ed6f4 commit 72bc26e

File tree

6 files changed

+4
-3
lines changed

6 files changed

+4
-3
lines changed

doc/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ Must be created project collection file `ModbusClient.qhcp`:
4242
Then `qhelpgenerator` must be executed, compiled help `*.qch` and compiled collection `*.qhc` files must be created:
4343

4444
```console
45-
c:\Qt\5.15.2\msvc2019_64\bin>qhelpgenerator "path\to\ModbusTools\doc\output\ModbusClient.qhcp"
46-
c:\Qt\5.15.2\msvc2019_64\bin>qhelpgenerator "path\to\ModbusTools\doc\output\ModbusServer.qhcp"
45+
c:\Qt\5.15.2\msvc2019_64\bin\qhelpgenerator.exe "ModbusClient.qhcp"
46+
c:\Qt\5.15.2\msvc2019_64\bin\qhelpgenerator.exe "ModbusServer.qhcp"
4747
```
4848

4949
To check correctness of help generation Qt assistant can be used:

doc/output/ModbusClient.qhc

0 Bytes
Binary file not shown.

doc/output/ModbusServer.chm

0 Bytes
Binary file not shown.

doc/output/ModbusServer.qhc

0 Bytes
Binary file not shown.

doc/output/ModbusServer.qhcp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</file>
99
</generate>
1010
<register>
11-
<file>output/ModbusServer.qch</file>
11+
<file>ModbusServer.qch</file>
1212
</register>
1313
</docFiles>
1414
</QHelpCollectionProject>

src/core/gui/help/core_helpui.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ mbCoreHelpUi::mbCoreHelpUi(const QString &relativeCollectionFile, QWidget *paren
6565
if (!m_helpEngine->setupData())
6666
mbCore::LogError("HelpSystem", "HelpEngine is not setup. Error: " + m_helpEngine->error());
6767

68+
//QStringList registeredDocumentations = m_helpEngine->registeredDocumentations();
6869
QTabWidget* tabWidget = new QTabWidget;
6970
tabWidget->addTab(m_helpEngine->contentWidget(), "Contents");
7071
tabWidget->addTab(m_helpEngine->indexWidget (), "Index" );

0 commit comments

Comments
 (0)