Get assistant to compile against refactor

Give the source code a somewhat saner structure while
I'm at it.

Change-Id: I99766405debe231a0562dd623ba1d17f19333656
Reviewed-on: http://codereview.qt-project.org/4829


Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

modules/qt_clucene.pri

@@ -7,8 +7,11 @@ QT.clucene.name = QtCLucene
 QT.clucene.bins = $$QT_MODULE_BIN_BASE
 QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucene
 QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/$$QT.clucene.VERSION
-QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch
+QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/clucene
 QT.clucene.libs = $$QT_MODULE_LIB_BASE
 QT.clucene.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.clucene.imports = $$QT_MODULE_IMPORT_BASE
 QT.clucene.depends = core
+QT.clucene.defines = QT_CLUCLENE_LIB
+
+QT_CONFIG += clucene

modules/qt_help.pri

@@ -7,9 +7,11 @@ QT.help.name = QtHelp
 QT.help.bins = $$QT_MODULE_BIN_BASE
 QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp
 QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/$$QT.help.VERSION
-QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib
+QT.help.sources = $$QT_MODULE_BASE/src/assistant/help
 QT.help.libs = $$QT_MODULE_LIB_BASE
 QT.help.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.help.imports = $$QT_MODULE_IMPORT_BASE
-QT.help.depends = network xml sql
+QT.help.depends = network sql
 QT.help.DEFINES = QT_HELP_LIB
+
+QT_CONFIG += help