summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2018-07-24 15:40:37 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2018-07-26 07:02:36 +0000
commit92bda3eabf2498f4965f9e162f91c1663230ff55 (patch)
tree36ca3c1a7ec02a6aceac7811d29c5f8730f57b1d /tests
parent30a75f7f0d540b5fd312b3cb2cf850e4e177c68b (diff)
Unexport HelpProjectData and move it to helpgenerator app tree
Change-Id: I5af687d5f7dd3fc886a33453b5613df062a8f5a2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qhelpgenerator/qhelpgenerator.pro8
-rw-r--r--tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp4
-rw-r--r--tests/auto/qhelpprojectdata/qhelpprojectdata.pro8
-rw-r--r--tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp2
4 files changed, 16 insertions, 6 deletions
diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro
index 06bc1c631..da3826844 100644
--- a/tests/auto/qhelpgenerator/qhelpgenerator.pro
+++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro
@@ -1,9 +1,13 @@
TARGET = tst_qhelpgenerator
CONFIG += testcase
-HEADERS += ../../../src/assistant/shared/helpgenerator.h
+HEADERS += ../../../src/assistant/qhelpgenerator/helpgenerator.h \
+ ../../../src/assistant/qhelpgenerator/qhelpdatainterface_p.h \
+ ../../../src/assistant/qhelpgenerator/qhelpprojectdata_p.h
SOURCES += tst_qhelpgenerator.cpp \
- ../../../src/assistant/shared/helpgenerator.cpp
+ ../../../src/assistant/qhelpgenerator/helpgenerator.cpp \
+ ../../../src/assistant/qhelpgenerator/qhelpdatainterface.cpp \
+ ../../../src/assistant/qhelpgenerator/qhelpprojectdata.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 b5ecc5118..14d264e84 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/qhelpprojectdata_p.h>
-#include "../../../src/assistant/shared/helpgenerator.h"
+#include "../../../src/assistant/qhelpgenerator/qhelpprojectdata_p.h"
+#include "../../../src/assistant/qhelpgenerator/helpgenerator.h"
class tst_QHelpGenerator : public QObject
{
diff --git a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
index ec2e313d5..51d127ac0 100644
--- a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
+++ b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
@@ -1,7 +1,13 @@
TARGET = tst_qhelpprojectdata
CONFIG += testcase
-SOURCES += tst_qhelpprojectdata.cpp
+HEADERS += ../../../src/assistant/qhelpgenerator/qhelpdatainterface_p.h \
+ ../../../src/assistant/qhelpgenerator/qhelpprojectdata_p.h
+
+SOURCES += tst_qhelpprojectdata.cpp \
+ ../../../src/assistant/qhelpgenerator/qhelpdatainterface.cpp \
+ ../../../src/assistant/qhelpgenerator/qhelpprojectdata.cpp
+
QT += help-private testlib
DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
index 36864163b..a09135d7c 100644
--- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
+++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
@@ -29,7 +29,7 @@
#include <QtCore/QFileInfo>
-#include <QtHelp/private/qhelpprojectdata_p.h>
+#include "../../../src/assistant/qhelpgenerator/qhelpprojectdata_p.h"
class tst_QHelpProjectData : public QObject
{