Move the QHelpGenerator into the shared folder

Don't export it anymore.

Change-Id: I5e3f00df9190d3284ae8169a3ce35ddb42d9be83
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

2 files changed, 7 insertions, 5 deletions

diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro
index 9134f53b3..06bc1c631 100644
--- a/tests/auto/qhelpgenerator/qhelpgenerator.pro
+++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro
@@ -1,7 +1,9 @@
 TARGET = tst_qhelpgenerator
 CONFIG += testcase
 
-SOURCES += tst_qhelpgenerator.cpp
+HEADERS += ../../../src/assistant/shared/helpgenerator.h
+SOURCES += tst_qhelpgenerator.cpp \
+           ../../../src/assistant/shared/helpgenerator.cpp
 QT      += help-private sql testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
index 6c94e431c..b5ecc5118 100644
--- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
+++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
@@ -31,8 +31,8 @@
 #include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlQuery>
 
-#include <QtHelp/private/qhelpgenerator_p.h>
 #include <QtHelp/private/qhelpprojectdata_p.h>
+#include "../../../src/assistant/shared/helpgenerator.h"
 
 class tst_QHelpGenerator : public QObject
 {
@@ -76,7 +76,7 @@ void tst_QHelpGenerator::generateHelp()
     if (!data.readData(inputFile))
         QFAIL("Cannot read qthp file!");
 
-    QHelpGenerator generator;
+    HelpGenerator generator;
     QCOMPARE(generator.generate(&data, m_outputFile), true);
 
     {
@@ -201,8 +201,8 @@ void tst_QHelpGenerator::generateTwice()
     if (!data.readData(inputFile))
         QFAIL("Cannot read qhp file!");
 
-    QHelpGenerator generator1;
-    QHelpGenerator generator2;
+    HelpGenerator generator1;
+    HelpGenerator generator2;
     QString outputFile1 = path + QLatin1String("/data/test1.qch");
     QString outputFile2 = path + QLatin1String("/data/test2.qch");
     QCOMPARE(generator1.generate(&data, outputFile1), true);