Unexport HelpProjectData and move it to helpgenerator app tree

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

9 files changed, 18 insertions, 20 deletions

diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
index efb3c2a2a..7ffa008c5 100644
--- a/src/assistant/help/help.pro
+++ b/src/assistant/help/help.pro
@@ -15,8 +15,6 @@ SOURCES += qhelpenginecore.cpp \
     qhelpdbreader.cpp \
     qhelpcontentwidget.cpp \
     qhelpindexwidget.cpp \
-    qhelpdatainterface.cpp \
-    qhelpprojectdata.cpp \
     qhelpcollectionhandler.cpp \
     qhelpsearchengine.cpp \
     qhelpsearchquerywidget.cpp \
@@ -33,8 +31,6 @@ HEADERS += qhelpenginecore.h \
     qhelpdbreader_p.h \
     qhelpcontentwidget.h \
     qhelpindexwidget.h \
-    qhelpdatainterface_p.h \
-    qhelpprojectdata_p.h \
     qhelpcollectionhandler_p.h \
     qhelpsearchengine.h \
     qhelpsearchquerywidget.h \
diff --git a/src/assistant/shared/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
index 45a44f4fe..440d5b4d9 100644
--- a/src/assistant/shared/helpgenerator.cpp
+++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "helpgenerator.h"
-#include <private/qhelpdatainterface_p.h>
+#include "qhelpdatainterface_p.h"
 #include <qhelp_global.h>
 
 #include <QtCore/QtMath>
diff --git a/src/assistant/shared/helpgenerator.h b/src/assistant/qhelpgenerator/helpgenerator.h
index 4ca84c73a..4ca84c73a 100644
--- a/src/assistant/shared/helpgenerator.h
+++ b/src/assistant/qhelpgenerator/helpgenerator.h
diff --git a/src/assistant/qhelpgenerator/main.cpp b/src/assistant/qhelpgenerator/main.cpp
index bca4ec248..ce9d46498 100644
--- a/src/assistant/qhelpgenerator/main.cpp
+++ b/src/assistant/qhelpgenerator/main.cpp
@@ -27,8 +27,9 @@
 ****************************************************************************/
 
 #include "../shared/collectionconfiguration.h"
-#include "../shared/helpgenerator.h"
+#include "helpgenerator.h"
 #include "collectionconfigreader.h"
+#include "qhelpprojectdata_p.h"
 
 #include <QtCore/QBuffer>
 #include <QtCore/QDataStream>
@@ -41,7 +42,6 @@
 
 #include <QtHelp/QHelpEngineCore>
 
-#include <private/qhelpprojectdata_p.h>
 
 QT_USE_NAMESPACE
 
diff --git a/src/assistant/help/qhelpdatainterface.cpp b/src/assistant/qhelpgenerator/qhelpdatainterface.cpp
index fade438e1..fade438e1 100644
--- a/src/assistant/help/qhelpdatainterface.cpp
+++ b/src/assistant/qhelpgenerator/qhelpdatainterface.cpp
diff --git a/src/assistant/help/qhelpdatainterface_p.h b/src/assistant/qhelpgenerator/qhelpdatainterface_p.h
index 0cff9ccf5..0bc6969d1 100644
--- a/src/assistant/help/qhelpdatainterface_p.h
+++ b/src/assistant/qhelpgenerator/qhelpdatainterface_p.h
@@ -51,14 +51,13 @@
 // We mean it.
 //
 
-#include "qhelp_global.h"
-
-#include <QtCore/QStringList>
 #include <QtCore/QSharedData>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
 
-class QHELP_EXPORT QHelpDataContentItem
+class QHelpDataContentItem
 {
 public:
     QHelpDataContentItem(QHelpDataContentItem *parent, const QString &title,
@@ -75,7 +74,7 @@ private:
     QList<QHelpDataContentItem*> m_children;
 };
 
-struct QHELP_EXPORT QHelpDataIndexItem {
+struct QHelpDataIndexItem {
     QHelpDataIndexItem() {}
     QHelpDataIndexItem(const QString &n, const QString &id, const QString &r)
         : name(n), identifier(id), reference(r) {}
@@ -101,7 +100,7 @@ public:
     QStringList files;
 };
 
-class QHELP_EXPORT QHelpDataFilterSection
+class QHelpDataFilterSection
 {
 public:
     QHelpDataFilterSection();
@@ -125,12 +124,12 @@ private:
     QSharedDataPointer<QHelpDataFilterSectionData> d;
 };
 
-struct QHELP_EXPORT QHelpDataCustomFilter {
+struct QHelpDataCustomFilter {
     QStringList filterAttributes;
     QString name;
 };
 
-class QHELP_EXPORT QHelpDataInterface
+class QHelpDataInterface
 {
 public:
     QHelpDataInterface() {}
diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro
index 0e7b08b48..dabd87ccc 100644
--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
@@ -3,13 +3,17 @@ QT += network help-private
 QTPLUGIN.platforms = qminimal
 
 SOURCES += ../shared/collectionconfiguration.cpp \
-           ../shared/helpgenerator.cpp \
+           helpgenerator.cpp \
            collectionconfigreader.cpp \
+           qhelpprojectdata.cpp \
+           qhelpdatainterface.cpp \
            main.cpp
 
 HEADERS += ../shared/collectionconfiguration.h \
-           ../shared/helpgenerator.h \
-           collectionconfigreader.h
+           helpgenerator.h \
+           collectionconfigreader.h \
+           qhelpprojectdata_p.h \
+           qhelpdatainterface_p.h
 
 QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator"
 load(qt_tool)
diff --git a/src/assistant/help/qhelpprojectdata.cpp b/src/assistant/qhelpgenerator/qhelpprojectdata.cpp
index 90bf75a5f..90bf75a5f 100644
--- a/src/assistant/help/qhelpprojectdata.cpp
+++ b/src/assistant/qhelpgenerator/qhelpprojectdata.cpp
diff --git a/src/assistant/help/qhelpprojectdata_p.h b/src/assistant/qhelpgenerator/qhelpprojectdata_p.h
index 1abd12c1c..227c67bb9 100644
--- a/src/assistant/help/qhelpprojectdata_p.h
+++ b/src/assistant/qhelpgenerator/qhelpprojectdata_p.h
@@ -51,14 +51,13 @@
 // We mean it.
 //
 
-#include "qhelp_global.h"
 #include "qhelpdatainterface_p.h"
 
 QT_BEGIN_NAMESPACE
 
 class QHelpProjectDataPrivate;
 
-class QHELP_EXPORT QHelpProjectData : public QHelpDataInterface
+class QHelpProjectData : public QHelpDataInterface
 {
 public:
     QHelpProjectData();