515 files changed, 122 insertions, 183 deletions

diff --git a/modules/qt_clucene.pri b/modules/qt_clucene.pri
index 49e79f5b6..e8d56b5f7 100644
--- a/modules/qt_clucene.pri
+++ b/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
diff --git a/modules/qt_help.pri b/modules/qt_help.pri
index f4e088780..a61086ccc 100644
--- a/modules/qt_help.pri
+++ b/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
diff --git a/3rdparty/clucene/APACHE.license b/src/assistant/3rdparty/clucene/APACHE.license
index 261eeb9e9..261eeb9e9 100644
--- a/3rdparty/clucene/APACHE.license
+++ b/src/assistant/3rdparty/clucene/APACHE.license
diff --git a/3rdparty/clucene/AUTHORS b/src/assistant/3rdparty/clucene/AUTHORS
index 4a7904b6d..4a7904b6d 100644
--- a/3rdparty/clucene/AUTHORS
+++ b/src/assistant/3rdparty/clucene/AUTHORS
diff --git a/3rdparty/clucene/COPYING b/src/assistant/3rdparty/clucene/COPYING
index 0e32bb4f3..0e32bb4f3 100644
--- a/3rdparty/clucene/COPYING
+++ b/src/assistant/3rdparty/clucene/COPYING
diff --git a/3rdparty/clucene/ChangeLog b/src/assistant/3rdparty/clucene/ChangeLog
index e69de29bb..e69de29bb 100644
--- a/3rdparty/clucene/ChangeLog
+++ b/src/assistant/3rdparty/clucene/ChangeLog
diff --git a/3rdparty/clucene/LGPL.license b/src/assistant/3rdparty/clucene/LGPL.license
index 422c76072..422c76072 100644
--- a/3rdparty/clucene/LGPL.license
+++ b/src/assistant/3rdparty/clucene/LGPL.license
diff --git a/3rdparty/clucene/README b/src/assistant/3rdparty/clucene/README
index ee4f49369..ee4f49369 100644
--- a/3rdparty/clucene/README
+++ b/src/assistant/3rdparty/clucene/README
diff --git a/3rdparty/clucene/src/CLucene.h b/src/assistant/3rdparty/clucene/src/CLucene.h
index 1eac800fd..1eac800fd 100644
--- a/3rdparty/clucene/src/CLucene.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene.h
diff --git a/3rdparty/clucene/src/CLucene/CLBackwards.h b/src/assistant/3rdparty/clucene/src/CLucene/CLBackwards.h
index ffaf42824..ffaf42824 100644
--- a/3rdparty/clucene/src/CLucene/CLBackwards.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/CLBackwards.h
diff --git a/3rdparty/clucene/src/CLucene/CLConfig.h b/src/assistant/3rdparty/clucene/src/CLucene/CLConfig.h
index c63c083ff..c63c083ff 100644
--- a/3rdparty/clucene/src/CLucene/CLConfig.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/CLConfig.h
diff --git a/3rdparty/clucene/src/CLucene/CLMonolithic.cpp b/src/assistant/3rdparty/clucene/src/CLucene/CLMonolithic.cpp
index e3c279876..e3c279876 100644
--- a/3rdparty/clucene/src/CLucene/CLMonolithic.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/CLMonolithic.cpp
diff --git a/3rdparty/clucene/src/CLucene/LuceneThreads.h b/src/assistant/3rdparty/clucene/src/CLucene/LuceneThreads.h
index cad07869f..cad07869f 100644
--- a/3rdparty/clucene/src/CLucene/LuceneThreads.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/LuceneThreads.h
diff --git a/3rdparty/clucene/src/CLucene/StdHeader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.cpp
index d64c51f77..d64c51f77 100644
--- a/3rdparty/clucene/src/CLucene/StdHeader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.cpp
diff --git a/3rdparty/clucene/src/CLucene/StdHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.h
index fbb3fd949..fbb3fd949 100644
--- a/3rdparty/clucene/src/CLucene/StdHeader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.cpp
index 03f61a038..03f61a038 100644
--- a/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.h
index 0cfd9c684..0cfd9c684 100644
--- a/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp
index 142bbfb63..142bbfb63 100644
--- a/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/Analyzers.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.h
index a12bd653f..a12bd653f 100644
--- a/3rdparty/clucene/src/CLucene/analysis/Analyzers.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.cpp
index e0994c41a..e0994c41a 100644
--- a/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.h
index 9cce041df..9cce041df 100644
--- a/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.cpp
index 9869d2592..9869d2592 100644
--- a/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.h
index 59657fdb3..59657fdb3 100644
--- a/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.cpp
index 60f9a449c..60f9a449c 100644
--- a/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.h
index d4195be81..d4195be81 100644
--- a/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizerConstants.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizerConstants.h
index 3c95af45a..3c95af45a 100644
--- a/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizerConstants.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizerConstants.h
diff --git a/3rdparty/clucene/src/CLucene/config/CompilerAcc.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerAcc.h
index 6ecd142be..6ecd142be 100644
--- a/3rdparty/clucene/src/CLucene/config/CompilerAcc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerAcc.h
diff --git a/3rdparty/clucene/src/CLucene/config/CompilerBcb.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerBcb.h
index f1b423b50..f1b423b50 100644
--- a/3rdparty/clucene/src/CLucene/config/CompilerBcb.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerBcb.h
diff --git a/3rdparty/clucene/src/CLucene/config/CompilerGcc.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
index a9120988b..41310cefe 100644
--- a/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
@@ -12,7 +12,7 @@
 // It is internal CLucene header - DO NOT include it directly
 #if !defined(_SUPPRESS_MAKE_BASED_CONFIG)
     #if defined(_BUILD_FOR_QT_)
-        #include "fulltextsearch/qclucene-config_p.h"
+        #include "qclucene-config_p.h"
     #else
         #include "CLucene/clucene-config.h" //make clucene-config.h file
     #endif
diff --git a/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h
index 0021ea368..0021ea368 100644
--- a/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h
diff --git a/3rdparty/clucene/src/CLucene/config/PlatformMac.h b/src/assistant/3rdparty/clucene/src/CLucene/config/PlatformMac.h
index 9f6d6f421..9f6d6f421 100644
--- a/3rdparty/clucene/src/CLucene/config/PlatformMac.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/PlatformMac.h
diff --git a/3rdparty/clucene/src/CLucene/config/PlatformUnix.h b/src/assistant/3rdparty/clucene/src/CLucene/config/PlatformUnix.h
index 202a894bd..202a894bd 100644
--- a/3rdparty/clucene/src/CLucene/config/PlatformUnix.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/PlatformUnix.h
diff --git a/3rdparty/clucene/src/CLucene/config/PlatformWin32.h b/src/assistant/3rdparty/clucene/src/CLucene/config/PlatformWin32.h
index 8b8a1132e..8b8a1132e 100644
--- a/3rdparty/clucene/src/CLucene/config/PlatformWin32.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/PlatformWin32.h
diff --git a/3rdparty/clucene/src/CLucene/config/compiler.h b/src/assistant/3rdparty/clucene/src/CLucene/config/compiler.h
index 68f93b6e4..68f93b6e4 100644
--- a/3rdparty/clucene/src/CLucene/config/compiler.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/compiler.h
diff --git a/3rdparty/clucene/src/CLucene/config/define_std.h b/src/assistant/3rdparty/clucene/src/CLucene/config/define_std.h
index 22a079053..22a079053 100644
--- a/3rdparty/clucene/src/CLucene/config/define_std.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/define_std.h
diff --git a/3rdparty/clucene/src/CLucene/config/gunichartables.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
index 5463936f6..5463936f6 100644
--- a/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/gunichartables.h b/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.h
index 182a87054..182a87054 100644
--- a/3rdparty/clucene/src/CLucene/config/gunichartables.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.h
diff --git a/3rdparty/clucene/src/CLucene/config/repl_lltot.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_lltot.cpp
index 05a63b887..05a63b887 100644
--- a/3rdparty/clucene/src/CLucene/config/repl_lltot.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_lltot.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tchar.h b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tchar.h
index ba8aef5c6..ba8aef5c6 100644
--- a/3rdparty/clucene/src/CLucene/config/repl_tchar.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tchar.h
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tcscasecmp.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcscasecmp.cpp
index 1bee7b7a6..1bee7b7a6 100644
--- a/3rdparty/clucene/src/CLucene/config/repl_tcscasecmp.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcscasecmp.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tcslwr.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcslwr.cpp
index 2ae6abca4..2ae6abca4 100644
--- a/3rdparty/clucene/src/CLucene/config/repl_tcslwr.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcslwr.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tcstod.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcstod.cpp
index 1fd4ca770..1fd4ca770 100644
--- a/3rdparty/clucene/src/CLucene/config/repl_tcstod.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcstod.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tcstoll.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcstoll.cpp
index 246d66c80..246d66c80 100644
--- a/3rdparty/clucene/src/CLucene/config/repl_tcstoll.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcstoll.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp
index 62cecb78b..62cecb78b 100644
--- a/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_wchar.h b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_wchar.h
index 3e05c311c..3e05c311c 100644
--- a/3rdparty/clucene/src/CLucene/config/repl_wchar.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_wchar.h
diff --git a/3rdparty/clucene/src/CLucene/config/threadCSection.h b/src/assistant/3rdparty/clucene/src/CLucene/config/threadCSection.h
index ab1842051..ab1842051 100644
--- a/3rdparty/clucene/src/CLucene/config/threadCSection.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/threadCSection.h
diff --git a/3rdparty/clucene/src/CLucene/config/threadPthread.h b/src/assistant/3rdparty/clucene/src/CLucene/config/threadPthread.h
index d0ed9c4c9..d0ed9c4c9 100644
--- a/3rdparty/clucene/src/CLucene/config/threadPthread.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/threadPthread.h
diff --git a/3rdparty/clucene/src/CLucene/config/threads.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/threads.cpp
index 427e58092..427e58092 100644
--- a/3rdparty/clucene/src/CLucene/config/threads.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/threads.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/utf8.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/utf8.cpp
index 14ccf5aa9..14ccf5aa9 100644
--- a/3rdparty/clucene/src/CLucene/config/utf8.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/utf8.cpp
diff --git a/3rdparty/clucene/src/CLucene/debug/condition.cpp b/src/assistant/3rdparty/clucene/src/CLucene/debug/condition.cpp
index 855419451..855419451 100644
--- a/3rdparty/clucene/src/CLucene/debug/condition.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/debug/condition.cpp
diff --git a/3rdparty/clucene/src/CLucene/debug/condition.h b/src/assistant/3rdparty/clucene/src/CLucene/debug/condition.h
index ab227e508..ab227e508 100644
--- a/3rdparty/clucene/src/CLucene/debug/condition.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/debug/condition.h
diff --git a/3rdparty/clucene/src/CLucene/debug/error.cpp b/src/assistant/3rdparty/clucene/src/CLucene/debug/error.cpp
index 53ea0e93b..53ea0e93b 100644
--- a/3rdparty/clucene/src/CLucene/debug/error.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/debug/error.cpp
diff --git a/3rdparty/clucene/src/CLucene/debug/error.h b/src/assistant/3rdparty/clucene/src/CLucene/debug/error.h
index 5abcc802c..5abcc802c 100644
--- a/3rdparty/clucene/src/CLucene/debug/error.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/debug/error.h
diff --git a/3rdparty/clucene/src/CLucene/debug/lucenebase.h b/src/assistant/3rdparty/clucene/src/CLucene/debug/lucenebase.h
index 86cdae1c5..86cdae1c5 100644
--- a/3rdparty/clucene/src/CLucene/debug/lucenebase.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/debug/lucenebase.h
diff --git a/3rdparty/clucene/src/CLucene/debug/mem.h b/src/assistant/3rdparty/clucene/src/CLucene/debug/mem.h
index e15c3de8b..e15c3de8b 100644
--- a/3rdparty/clucene/src/CLucene/debug/mem.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/debug/mem.h
diff --git a/3rdparty/clucene/src/CLucene/debug/memtracking.cpp b/src/assistant/3rdparty/clucene/src/CLucene/debug/memtracking.cpp
index 544a125a5..544a125a5 100644
--- a/3rdparty/clucene/src/CLucene/debug/memtracking.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/debug/memtracking.cpp
diff --git a/3rdparty/clucene/src/CLucene/document/DateField.cpp b/src/assistant/3rdparty/clucene/src/CLucene/document/DateField.cpp
index ff72b12bb..ff72b12bb 100644
--- a/3rdparty/clucene/src/CLucene/document/DateField.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/document/DateField.cpp
diff --git a/3rdparty/clucene/src/CLucene/document/DateField.h b/src/assistant/3rdparty/clucene/src/CLucene/document/DateField.h
index 712fe9b62..712fe9b62 100644
--- a/3rdparty/clucene/src/CLucene/document/DateField.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/document/DateField.h
diff --git a/3rdparty/clucene/src/CLucene/document/Document.cpp b/src/assistant/3rdparty/clucene/src/CLucene/document/Document.cpp
index a0ce03942..a0ce03942 100644
--- a/3rdparty/clucene/src/CLucene/document/Document.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/document/Document.cpp
diff --git a/3rdparty/clucene/src/CLucene/document/Document.h b/src/assistant/3rdparty/clucene/src/CLucene/document/Document.h
index ba7a283f7..ba7a283f7 100644
--- a/3rdparty/clucene/src/CLucene/document/Document.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/document/Document.h
diff --git a/3rdparty/clucene/src/CLucene/document/Field.cpp b/src/assistant/3rdparty/clucene/src/CLucene/document/Field.cpp
index 8cd88a36b..8cd88a36b 100644
--- a/3rdparty/clucene/src/CLucene/document/Field.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/document/Field.cpp
diff --git a/3rdparty/clucene/src/CLucene/document/Field.h b/src/assistant/3rdparty/clucene/src/CLucene/document/Field.h
index 771a1382b..771a1382b 100644
--- a/3rdparty/clucene/src/CLucene/document/Field.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/document/Field.h
diff --git a/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp
index efa0e2563..efa0e2563 100644
--- a/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/CompoundFile.h b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.h
index 84799a62f..84799a62f 100644
--- a/3rdparty/clucene/src/CLucene/index/CompoundFile.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.h
diff --git a/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp
index dcbc31591..dcbc31591 100644
--- a/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/DocumentWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.h
index 7096ba3ee..7096ba3ee 100644
--- a/3rdparty/clucene/src/CLucene/index/DocumentWriter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.h
diff --git a/3rdparty/clucene/src/CLucene/index/FieldInfo.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfo.h
index 387c4a6ac..387c4a6ac 100644
--- a/3rdparty/clucene/src/CLucene/index/FieldInfo.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfo.h
diff --git a/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp
index 0c66882f4..0c66882f4 100644
--- a/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/FieldInfos.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.h
index 7b6d0f56d..7b6d0f56d 100644
--- a/3rdparty/clucene/src/CLucene/index/FieldInfos.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.h
diff --git a/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp
index e3f9d1cc2..e3f9d1cc2 100644
--- a/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/FieldsReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.h
index 53589a5cc..53589a5cc 100644
--- a/3rdparty/clucene/src/CLucene/index/FieldsReader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.h
diff --git a/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp
index ceb6735cb..ceb6735cb 100644
--- a/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/FieldsWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.h
index 7dde5f225..7dde5f225 100644
--- a/3rdparty/clucene/src/CLucene/index/FieldsWriter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.h
diff --git a/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
index 1423cc7a8..1423cc7a8 100644
--- a/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/IndexModifier.h b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.h
index 4e9963f5a..4e9963f5a 100644
--- a/3rdparty/clucene/src/CLucene/index/IndexModifier.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.h
diff --git a/3rdparty/clucene/src/CLucene/index/IndexReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.cpp
index 91c735632..91c735632 100644
--- a/3rdparty/clucene/src/CLucene/index/IndexReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/IndexReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.h
index 352d16e80..352d16e80 100644
--- a/3rdparty/clucene/src/CLucene/index/IndexReader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.h
diff --git a/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
index 5504cf6fa..5504cf6fa 100644
--- a/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/IndexWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.h
index 80476c864..80476c864 100644
--- a/3rdparty/clucene/src/CLucene/index/IndexWriter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.h
diff --git a/3rdparty/clucene/src/CLucene/index/MultiReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/MultiReader.cpp
index 1260d04dc..1260d04dc 100644
--- a/3rdparty/clucene/src/CLucene/index/MultiReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/MultiReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/MultiReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/MultiReader.h
index 1d76814e1..1d76814e1 100644
--- a/3rdparty/clucene/src/CLucene/index/MultiReader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/MultiReader.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentHeader.h
index 00b08991d..00b08991d 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentHeader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentHeader.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp
index f62c4061a..f62c4061a 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentInfos.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.h
index ce7183820..ce7183820 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentInfos.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.cpp
index 85ac784ad..85ac784ad 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.h
index 7ffd46ade..7ffd46ade 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.cpp
index 879781287..879781287 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.h
index faa690252..faa690252 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
index 40814da0c..40814da0c 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMerger.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.h
index 230843b00..230843b00 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentMerger.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp
index ba061714b..ba061714b 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermDocs.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermDocs.cpp
index 50951e9ba..50951e9ba 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentTermDocs.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermDocs.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.cpp
index 20e286fd1..20e286fd1 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.h
index 0d50103f3..0d50103f3 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermPositions.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermPositions.cpp
index e481838e9..e481838e9 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentTermPositions.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermPositions.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermVector.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermVector.cpp
index 5e9ac3c3b..5e9ac3c3b 100644
--- a/3rdparty/clucene/src/CLucene/index/SegmentTermVector.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermVector.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/Term.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.cpp
index 5ff7bb264..5ff7bb264 100644
--- a/3rdparty/clucene/src/CLucene/index/Term.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/Term.h b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.h
index 68eefd194..68eefd194 100644
--- a/3rdparty/clucene/src/CLucene/index/Term.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfo.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.cpp
index ac1107317..ac1107317 100644
--- a/3rdparty/clucene/src/CLucene/index/TermInfo.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfo.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.h
index 57b7a9a76..57b7a9a76 100644
--- a/3rdparty/clucene/src/CLucene/index/TermInfo.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp
index 8f9e43dec..8f9e43dec 100644
--- a/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfosReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.h
index ed202e750..ed202e750 100644
--- a/3rdparty/clucene/src/CLucene/index/TermInfosReader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp
index c5b5340c3..c5b5340c3 100644
--- a/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h
index 7e3c68699..7e3c68699 100644
--- a/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermVector.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVector.h
index 8601fbf53..8601fbf53 100644
--- a/3rdparty/clucene/src/CLucene/index/TermVector.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVector.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
index 53d909b29..53d909b29 100644
--- a/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp
index 276b1bbd0..276b1bbd0 100644
--- a/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/Terms.h b/src/assistant/3rdparty/clucene/src/CLucene/index/Terms.h
index 806441876..806441876 100644
--- a/3rdparty/clucene/src/CLucene/index/Terms.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/Terms.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp
index 861c5d3cb..861c5d3cb 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/Lexer.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.h
index b3b55523e..b3b55523e 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/Lexer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp
index b57896b66..b57896b66 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.h
index bf7d652a7..bf7d652a7 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp
index b11eec0bb..b11eec0bb 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryParser.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.h
index a2fc85c89..a2fc85c89 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/QueryParser.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
index 7b95b30f9..7b95b30f9 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.h
index 261e587b0..261e587b0 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryToken.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryToken.cpp
index ee88a3cb6..ee88a3cb6 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/QueryToken.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryToken.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryToken.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryToken.h
index 739a667ba..739a667ba 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/QueryToken.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryToken.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/TokenList.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/TokenList.cpp
index 7d30b931f..7d30b931f 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/TokenList.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/TokenList.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/TokenList.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/TokenList.h
index 3166bba78..3166bba78 100644
--- a/3rdparty/clucene/src/CLucene/queryParser/TokenList.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/TokenList.h
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanClause.h b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanClause.h
index b89cb31d7..b89cb31d7 100644
--- a/3rdparty/clucene/src/CLucene/search/BooleanClause.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanClause.h
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanQuery.cpp
index 3fd36d847..3fd36d847 100644
--- a/3rdparty/clucene/src/CLucene/search/BooleanQuery.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanQuery.h
index 27b67d1e5..27b67d1e5 100644
--- a/3rdparty/clucene/src/CLucene/search/BooleanQuery.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.cpp
index ae7ee40d6..ae7ee40d6 100644
--- a/3rdparty/clucene/src/CLucene/search/BooleanScorer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.h
index 2147bc516..2147bc516 100644
--- a/3rdparty/clucene/src/CLucene/search/BooleanScorer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.cpp
index 694556ca7..694556ca7 100644
--- a/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.h
index e48a18292..e48a18292 100644
--- a/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/ChainedFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/ChainedFilter.cpp
index 4b6389c0f..4b6389c0f 100644
--- a/3rdparty/clucene/src/CLucene/search/ChainedFilter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/ChainedFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/ChainedFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/ChainedFilter.h
index f4d9d0049..f4d9d0049 100644
--- a/3rdparty/clucene/src/CLucene/search/ChainedFilter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/ChainedFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/Compare.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Compare.h
index ab38b17f1..ab38b17f1 100644
--- a/3rdparty/clucene/src/CLucene/search/Compare.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Compare.h
diff --git a/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.cpp
index 9b7846f8e..9b7846f8e 100644
--- a/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.h
index 4b6807209..4b6807209 100644
--- a/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/DateFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/DateFilter.cpp
index 925858204..925858204 100644
--- a/3rdparty/clucene/src/CLucene/search/DateFilter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/DateFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/DateFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/DateFilter.h
index b37272b84..b37272b84 100644
--- a/3rdparty/clucene/src/CLucene/search/DateFilter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/DateFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.cpp
index 1fbf2e99d..1fbf2e99d 100644
--- a/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.h
index d82aa9e9a..d82aa9e9a 100644
--- a/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/Explanation.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/Explanation.cpp
index 87189b71b..87189b71b 100644
--- a/3rdparty/clucene/src/CLucene/search/Explanation.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Explanation.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/Explanation.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Explanation.h
index 7c95822b6..7c95822b6 100644
--- a/3rdparty/clucene/src/CLucene/search/Explanation.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Explanation.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldCache.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCache.cpp
index fae672019..fae672019 100644
--- a/3rdparty/clucene/src/CLucene/search/FieldCache.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCache.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FieldCache.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCache.h
index eeec26f33..eeec26f33 100644
--- a/3rdparty/clucene/src/CLucene/search/FieldCache.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCache.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
index 62052097e..62052097e 100644
--- a/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.h
index ac3c4cabc..ac3c4cabc 100644
--- a/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldDoc.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldDoc.h
index 6ce915acf..6ce915acf 100644
--- a/3rdparty/clucene/src/CLucene/search/FieldDoc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldDoc.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.cpp
index 0a5210903..0a5210903 100644
--- a/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.h
index 5a46b3b65..5a46b3b65 100644
--- a/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.cpp
index 04f45e931..04f45e931 100644
--- a/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.h
index d7b16ce9e..d7b16ce9e 100644
--- a/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.h
diff --git a/3rdparty/clucene/src/CLucene/search/Filter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Filter.h
index 309c5a9d6..309c5a9d6 100644
--- a/3rdparty/clucene/src/CLucene/search/Filter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Filter.h
diff --git a/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.cpp
index f90ceeaaf..f90ceeaaf 100644
--- a/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.h
index 035ae384e..035ae384e 100644
--- a/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.h
diff --git a/3rdparty/clucene/src/CLucene/search/FuzzyQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FuzzyQuery.cpp
index e95d48da3..e95d48da3 100644
--- a/3rdparty/clucene/src/CLucene/search/FuzzyQuery.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FuzzyQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FuzzyQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FuzzyQuery.h
index e58637bb9..e58637bb9 100644
--- a/3rdparty/clucene/src/CLucene/search/FuzzyQuery.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/FuzzyQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/HitQueue.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/HitQueue.cpp
index c9aecc6b4..c9aecc6b4 100644
--- a/3rdparty/clucene/src/CLucene/search/HitQueue.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/HitQueue.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/HitQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/search/HitQueue.h
index 0bd196a7f..0bd196a7f 100644
--- a/3rdparty/clucene/src/CLucene/search/HitQueue.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/HitQueue.h
diff --git a/3rdparty/clucene/src/CLucene/search/Hits.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/Hits.cpp
index 38c489f44..38c489f44 100644
--- a/3rdparty/clucene/src/CLucene/search/Hits.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Hits.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp
index c948cfa4b..c948cfa4b 100644
--- a/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/IndexSearcher.h b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.h
index 307e0266d..307e0266d 100644
--- a/3rdparty/clucene/src/CLucene/search/IndexSearcher.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.h
diff --git a/3rdparty/clucene/src/CLucene/search/MultiSearcher.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiSearcher.cpp
index bed7f0d61..bed7f0d61 100644
--- a/3rdparty/clucene/src/CLucene/search/MultiSearcher.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiSearcher.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/MultiSearcher.h b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiSearcher.h
index 1021fbbec..1021fbbec 100644
--- a/3rdparty/clucene/src/CLucene/search/MultiSearcher.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiSearcher.h
diff --git a/3rdparty/clucene/src/CLucene/search/MultiTermQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiTermQuery.cpp
index 3bf8d7a26..3bf8d7a26 100644
--- a/3rdparty/clucene/src/CLucene/search/MultiTermQuery.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiTermQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/MultiTermQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiTermQuery.h
index d37645359..d37645359 100644
--- a/3rdparty/clucene/src/CLucene/search/MultiTermQuery.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiTermQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/PhrasePositions.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/PhrasePositions.cpp
index 7611056e7..7611056e7 100644
--- a/3rdparty/clucene/src/CLucene/search/PhrasePositions.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/PhrasePositions.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/PhrasePositions.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PhrasePositions.h
index b6c8437b9..b6c8437b9 100644
--- a/3rdparty/clucene/src/CLucene/search/PhrasePositions.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/PhrasePositions.h
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQuery.cpp
index 899cb3cfe..899cb3cfe 100644
--- a/3rdparty/clucene/src/CLucene/search/PhraseQuery.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQuery.h
index 6b3255822..6b3255822 100644
--- a/3rdparty/clucene/src/CLucene/search/PhraseQuery.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQueue.h
index c0682fcaf..c0682fcaf 100644
--- a/3rdparty/clucene/src/CLucene/search/PhraseQueue.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQueue.h
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseScorer.cpp
index b2da2316a..b2da2316a 100644
--- a/3rdparty/clucene/src/CLucene/search/PhraseScorer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseScorer.h
index 89f7a1fbb..89f7a1fbb 100644
--- a/3rdparty/clucene/src/CLucene/search/PhraseScorer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/PrefixQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/PrefixQuery.cpp
index 6bb27d1ca..6bb27d1ca 100644
--- a/3rdparty/clucene/src/CLucene/search/PrefixQuery.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/PrefixQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/PrefixQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PrefixQuery.h
index 8e3f41352..8e3f41352 100644
--- a/3rdparty/clucene/src/CLucene/search/PrefixQuery.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/PrefixQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/QueryFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/QueryFilter.cpp
index 2dbe2d7cd..2dbe2d7cd 100644
--- a/3rdparty/clucene/src/CLucene/search/QueryFilter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/QueryFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/QueryFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/QueryFilter.h
index 8d423b2f7..8d423b2f7 100644
--- a/3rdparty/clucene/src/CLucene/search/QueryFilter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/QueryFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/RangeFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeFilter.cpp
index 66ee5ce55..66ee5ce55 100644
--- a/3rdparty/clucene/src/CLucene/search/RangeFilter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/RangeFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeFilter.h
index 0865e356f..0865e356f 100644
--- a/3rdparty/clucene/src/CLucene/search/RangeFilter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/RangeQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeQuery.cpp
index 4fc242089..4fc242089 100644
--- a/3rdparty/clucene/src/CLucene/search/RangeQuery.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/RangeQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeQuery.h
index 9a7733c33..9a7733c33 100644
--- a/3rdparty/clucene/src/CLucene/search/RangeQuery.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/Scorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Scorer.h
index 0d1d4355a..0d1d4355a 100644
--- a/3rdparty/clucene/src/CLucene/search/Scorer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Scorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/SearchHeader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/SearchHeader.cpp
index 56e4ad585..56e4ad585 100644
--- a/3rdparty/clucene/src/CLucene/search/SearchHeader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/SearchHeader.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/SearchHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/search/SearchHeader.h
index 4a896a5c5..4a896a5c5 100644
--- a/3rdparty/clucene/src/CLucene/search/SearchHeader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/SearchHeader.h
diff --git a/3rdparty/clucene/src/CLucene/search/Similarity.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/Similarity.cpp
index d33a036e4..d33a036e4 100644
--- a/3rdparty/clucene/src/CLucene/search/Similarity.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Similarity.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/Similarity.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Similarity.h
index 426af6952..426af6952 100644
--- a/3rdparty/clucene/src/CLucene/search/Similarity.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Similarity.h
diff --git a/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.cpp
index b7683b018..b7683b018 100644
--- a/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.h
index 31516e393..31516e393 100644
--- a/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/Sort.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/Sort.cpp
index 5a17a784d..5a17a784d 100644
--- a/3rdparty/clucene/src/CLucene/search/Sort.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Sort.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/Sort.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Sort.h
index cfe96d56c..cfe96d56c 100644
--- a/3rdparty/clucene/src/CLucene/search/Sort.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/Sort.h
diff --git a/3rdparty/clucene/src/CLucene/search/TermQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/TermQuery.cpp
index a04c20fec..a04c20fec 100644
--- a/3rdparty/clucene/src/CLucene/search/TermQuery.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/TermQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/TermQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/TermQuery.h
index a7dd8039b..a7dd8039b 100644
--- a/3rdparty/clucene/src/CLucene/search/TermQuery.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/TermQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/TermScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/TermScorer.cpp
index ddd7f74ed..ddd7f74ed 100644
--- a/3rdparty/clucene/src/CLucene/search/TermScorer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/TermScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/TermScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/TermScorer.h
index ccbf5f7ec..ccbf5f7ec 100644
--- a/3rdparty/clucene/src/CLucene/search/TermScorer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/TermScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/WildcardQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardQuery.cpp
index 9373cef0a..9373cef0a 100644
--- a/3rdparty/clucene/src/CLucene/search/WildcardQuery.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/WildcardQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardQuery.h
index cfc38f648..cfc38f648 100644
--- a/3rdparty/clucene/src/CLucene/search/WildcardQuery.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.cpp
index bed9e6e0c..bed9e6e0c 100644
--- a/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.h b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.h
index 2a0373540..2a0373540 100644
--- a/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.h
diff --git a/3rdparty/clucene/src/CLucene/store/Directory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/Directory.h
index 818bc7af9..818bc7af9 100644
--- a/3rdparty/clucene/src/CLucene/store/Directory.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/Directory.h
diff --git a/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
index 5f96e91cd..5f96e91cd 100644
--- a/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/FSDirectory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.h
index e967380e0..e967380e0 100644
--- a/3rdparty/clucene/src/CLucene/store/FSDirectory.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.h
diff --git a/3rdparty/clucene/src/CLucene/store/IndexInput.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.cpp
index cf7bd16b7..cf7bd16b7 100644
--- a/3rdparty/clucene/src/CLucene/store/IndexInput.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/IndexInput.h b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.h
index 9453b5cf1..9453b5cf1 100644
--- a/3rdparty/clucene/src/CLucene/store/IndexInput.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.h
diff --git a/3rdparty/clucene/src/CLucene/store/IndexOutput.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexOutput.cpp
index 04f78c348..04f78c348 100644
--- a/3rdparty/clucene/src/CLucene/store/IndexOutput.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexOutput.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/IndexOutput.h b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexOutput.h
index c47ee73a7..c47ee73a7 100644
--- a/3rdparty/clucene/src/CLucene/store/IndexOutput.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexOutput.h
diff --git a/3rdparty/clucene/src/CLucene/store/InputStream.h b/src/assistant/3rdparty/clucene/src/CLucene/store/InputStream.h
index f56819eeb..f56819eeb 100644
--- a/3rdparty/clucene/src/CLucene/store/InputStream.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/InputStream.h
diff --git a/3rdparty/clucene/src/CLucene/store/Lock.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.cpp
index a66e784b0..a66e784b0 100644
--- a/3rdparty/clucene/src/CLucene/store/Lock.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/Lock.h b/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.h
index b5dda3b06..b5dda3b06 100644
--- a/3rdparty/clucene/src/CLucene/store/Lock.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.h
diff --git a/3rdparty/clucene/src/CLucene/store/MMapInput.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/MMapInput.cpp
index d660032c6..d660032c6 100644
--- a/3rdparty/clucene/src/CLucene/store/MMapInput.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/MMapInput.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/OutputStream.h b/src/assistant/3rdparty/clucene/src/CLucene/store/OutputStream.h
index a82d6718a..a82d6718a 100644
--- a/3rdparty/clucene/src/CLucene/store/OutputStream.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/OutputStream.h
diff --git a/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp
index b0a7c4d64..b0a7c4d64 100644
--- a/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/RAMDirectory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.h
index af92e30b2..af92e30b2 100644
--- a/3rdparty/clucene/src/CLucene/store/RAMDirectory.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.h
diff --git a/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp
index 056fa9bc3..056fa9bc3 100644
--- a/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h
index 44c5e8e99..44c5e8e99 100644
--- a/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h
diff --git a/3rdparty/clucene/src/CLucene/util/Arrays.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h
index ba60c5638..ba60c5638 100644
--- a/3rdparty/clucene/src/CLucene/util/Arrays.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h
diff --git a/3rdparty/clucene/src/CLucene/util/BitSet.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.cpp
index 3679bd120..3679bd120 100644
--- a/3rdparty/clucene/src/CLucene/util/BitSet.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/BitSet.h b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.h
index e93847e98..e93847e98 100644
--- a/3rdparty/clucene/src/CLucene/util/BitSet.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.h
diff --git a/3rdparty/clucene/src/CLucene/util/Equators.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.cpp
index e112bd234..e112bd234 100644
--- a/3rdparty/clucene/src/CLucene/util/Equators.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/Equators.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.h
index 11fcb0eaf..11fcb0eaf 100644
--- a/3rdparty/clucene/src/CLucene/util/Equators.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.h
diff --git a/3rdparty/clucene/src/CLucene/util/FastCharStream.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/FastCharStream.cpp
index f9fbe9b10..f9fbe9b10 100644
--- a/3rdparty/clucene/src/CLucene/util/FastCharStream.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/FastCharStream.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/FastCharStream.h b/src/assistant/3rdparty/clucene/src/CLucene/util/FastCharStream.h
index 24e5b5612..24e5b5612 100644
--- a/3rdparty/clucene/src/CLucene/util/FastCharStream.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/FastCharStream.h
diff --git a/3rdparty/clucene/src/CLucene/util/Misc.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.cpp
index 42e3fd0a8..42e3fd0a8 100644
--- a/3rdparty/clucene/src/CLucene/util/Misc.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/Misc.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.h
index 561c6e4d9..561c6e4d9 100644
--- a/3rdparty/clucene/src/CLucene/util/Misc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.h
diff --git a/3rdparty/clucene/src/CLucene/util/PriorityQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/util/PriorityQueue.h
index 45649ee7f..45649ee7f 100644
--- a/3rdparty/clucene/src/CLucene/util/PriorityQueue.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/PriorityQueue.h
diff --git a/3rdparty/clucene/src/CLucene/util/Reader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/Reader.cpp
index 1ce97106d..1ce97106d 100644
--- a/3rdparty/clucene/src/CLucene/util/Reader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Reader.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/Reader.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Reader.h
index 6b018b3aa..6b018b3aa 100644
--- a/3rdparty/clucene/src/CLucene/util/Reader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Reader.h
diff --git a/3rdparty/clucene/src/CLucene/util/StringBuffer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/StringBuffer.cpp
index b5f1ca238..b5f1ca238 100644
--- a/3rdparty/clucene/src/CLucene/util/StringBuffer.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/StringBuffer.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/StringBuffer.h b/src/assistant/3rdparty/clucene/src/CLucene/util/StringBuffer.h
index 505b57594..505b57594 100644
--- a/3rdparty/clucene/src/CLucene/util/StringBuffer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/StringBuffer.h
diff --git a/3rdparty/clucene/src/CLucene/util/StringIntern.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/StringIntern.cpp
index cb7a889d1..cb7a889d1 100644
--- a/3rdparty/clucene/src/CLucene/util/StringIntern.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/StringIntern.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/StringIntern.h b/src/assistant/3rdparty/clucene/src/CLucene/util/StringIntern.h
index ded060c64..ded060c64 100644
--- a/3rdparty/clucene/src/CLucene/util/StringIntern.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/StringIntern.h
diff --git a/3rdparty/clucene/src/CLucene/util/ThreadLocal.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.cpp
index a54c86916..a54c86916 100644
--- a/3rdparty/clucene/src/CLucene/util/ThreadLocal.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/ThreadLocal.h b/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.h
index f67c76ca9..f67c76ca9 100644
--- a/3rdparty/clucene/src/CLucene/util/ThreadLocal.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.h
diff --git a/3rdparty/clucene/src/CLucene/util/VoidList.h b/src/assistant/3rdparty/clucene/src/CLucene/util/VoidList.h
index cd6908876..cd6908876 100644
--- a/3rdparty/clucene/src/CLucene/util/VoidList.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/VoidList.h
diff --git a/3rdparty/clucene/src/CLucene/util/VoidMap.h b/src/assistant/3rdparty/clucene/src/CLucene/util/VoidMap.h
index b22b507e9..b22b507e9 100644
--- a/3rdparty/clucene/src/CLucene/util/VoidMap.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/VoidMap.h
diff --git a/3rdparty/clucene/src/CLucene/util/bufferedstream.h b/src/assistant/3rdparty/clucene/src/CLucene/util/bufferedstream.h
index d905955b1..d905955b1 100644
--- a/3rdparty/clucene/src/CLucene/util/bufferedstream.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/bufferedstream.h
diff --git a/3rdparty/clucene/src/CLucene/util/dirent.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/dirent.cpp
index 3c5c54200..3c5c54200 100644
--- a/3rdparty/clucene/src/CLucene/util/dirent.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/dirent.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/dirent.h b/src/assistant/3rdparty/clucene/src/CLucene/util/dirent.h
index 71cd34c0a..71cd34c0a 100644
--- a/3rdparty/clucene/src/CLucene/util/dirent.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/dirent.h
diff --git a/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp
index 9125d8478..9125d8478 100644
--- a/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/fileinputstream.h b/src/assistant/3rdparty/clucene/src/CLucene/util/fileinputstream.h
index 144423da8..144423da8 100644
--- a/3rdparty/clucene/src/CLucene/util/fileinputstream.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/fileinputstream.h
diff --git a/3rdparty/clucene/src/CLucene/util/inputstreambuffer.h b/src/assistant/3rdparty/clucene/src/CLucene/util/inputstreambuffer.h
index 873e811cd..873e811cd 100644
--- a/3rdparty/clucene/src/CLucene/util/inputstreambuffer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/inputstreambuffer.h
diff --git a/3rdparty/clucene/src/CLucene/util/jstreamsconfig.h b/src/assistant/3rdparty/clucene/src/CLucene/util/jstreamsconfig.h
index 2a6ce9f8d..2a6ce9f8d 100644
--- a/3rdparty/clucene/src/CLucene/util/jstreamsconfig.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/jstreamsconfig.h
diff --git a/3rdparty/clucene/src/CLucene/util/streambase.h b/src/assistant/3rdparty/clucene/src/CLucene/util/streambase.h
index b0d9dc167..b0d9dc167 100644
--- a/3rdparty/clucene/src/CLucene/util/streambase.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/streambase.h
diff --git a/3rdparty/clucene/src/CLucene/util/stringreader.h b/src/assistant/3rdparty/clucene/src/CLucene/util/stringreader.h
index 698d07e37..698d07e37 100644
--- a/3rdparty/clucene/src/CLucene/util/stringreader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/stringreader.h
diff --git a/3rdparty/clucene/src/CLucene/util/subinputstream.h b/src/assistant/3rdparty/clucene/src/CLucene/util/subinputstream.h
index 8ae3e33c7..8ae3e33c7 100644
--- a/3rdparty/clucene/src/CLucene/util/subinputstream.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/subinputstream.h
diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
index 97196b253..b16a1892b 100644
--- a/src/assistant/assistant.pro
+++ b/src/assistant/assistant.pro
@@ -1,6 +1,10 @@
 TEMPLATE = subdirs
 CONFIG  += ordered
 
-SUBDIRS += lib/fulltextsearch \
-           lib \
-           tools
+SUBDIRS += clucene \
+	   help \
+           assistant \
+           qhelpgenerator \
+           qcollectiongenerator \
+           qhelpconverter
+
diff --git a/src/assistant/tools/assistant/Info_mac.plist b/src/assistant/assistant/Info_mac.plist
index 76369a1c5..76369a1c5 100644
--- a/src/assistant/tools/assistant/Info_mac.plist
+++ b/src/assistant/assistant/Info_mac.plist
diff --git a/src/assistant/tools/assistant/aboutdialog.cpp b/src/assistant/assistant/aboutdialog.cpp
index d306812bb..d306812bb 100644
--- a/src/assistant/tools/assistant/aboutdialog.cpp
+++ b/src/assistant/assistant/aboutdialog.cpp
diff --git a/src/assistant/tools/assistant/aboutdialog.h b/src/assistant/assistant/aboutdialog.h
index 70b315714..70b315714 100644
--- a/src/assistant/tools/assistant/aboutdialog.h
+++ b/src/assistant/assistant/aboutdialog.h
diff --git a/src/assistant/tools/assistant/assistant.icns b/src/assistant/assistant/assistant.icns
index 6291dd397..6291dd397 100644
--- a/src/assistant/tools/assistant/assistant.icns
+++ b/src/assistant/assistant/assistant.icns
diff --git a/src/assistant/tools/assistant/assistant.ico b/src/assistant/assistant/assistant.ico
index 9e1b83f1b..9e1b83f1b 100644
--- a/src/assistant/tools/assistant/assistant.ico
+++ b/src/assistant/assistant/assistant.ico
diff --git a/src/assistant/tools/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index dc8928bad..37e0282ce 100644
--- a/src/assistant/tools/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -1,4 +1,3 @@
-include(../../../shared/fontpanel/fontpanel.pri)
 TEMPLATE = app
 LANGUAGE = C++
 TARGET = assistant
@@ -10,13 +9,12 @@ TARGET = assistant
 CONFIG += qt \
     warn_on \
     help
-QT += widgets network help
+QT += widgets printsupport network help
 PROJECTNAME = Assistant
-DESTDIR = $$QT.designer.bins
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
+
 DEPENDPATH += ../shared
-INCLUDEPATH += $$QT.help.includes
+
+include(../../shared/fontpanel/fontpanel.pri)
 
 # ## Work around a qmake issue when statically linking to
 # ## not-yet-installed plugins
diff --git a/src/assistant/tools/assistant/assistant.qch b/src/assistant/assistant/assistant.qch
index e6d52997b..e6d52997b 100644
--- a/src/assistant/tools/assistant/assistant.qch
+++ b/src/assistant/assistant/assistant.qch
diff --git a/src/assistant/tools/assistant/assistant.qrc b/src/assistant/assistant/assistant.qrc
index dddf1be75..dddf1be75 100644
--- a/src/assistant/tools/assistant/assistant.qrc
+++ b/src/assistant/assistant/assistant.qrc
diff --git a/src/assistant/tools/assistant/assistant.rc b/src/assistant/assistant/assistant.rc
index b1bf97b5c..b1bf97b5c 100644
--- a/src/assistant/tools/assistant/assistant.rc
+++ b/src/assistant/assistant/assistant.rc
diff --git a/src/assistant/tools/assistant/assistant_images.qrc b/src/assistant/assistant/assistant_images.qrc
index b4f25236d..b4f25236d 100644
--- a/src/assistant/tools/assistant/assistant_images.qrc
+++ b/src/assistant/assistant/assistant_images.qrc
diff --git a/src/assistant/tools/assistant/bookmarkdialog.cpp b/src/assistant/assistant/bookmarkdialog.cpp
index e3cd9ac60..e3cd9ac60 100644
--- a/src/assistant/tools/assistant/bookmarkdialog.cpp
+++ b/src/assistant/assistant/bookmarkdialog.cpp
diff --git a/src/assistant/tools/assistant/bookmarkdialog.h b/src/assistant/assistant/bookmarkdialog.h
index dfa65bbf8..dfa65bbf8 100644
--- a/src/assistant/tools/assistant/bookmarkdialog.h
+++ b/src/assistant/assistant/bookmarkdialog.h
diff --git a/src/assistant/tools/assistant/bookmarkdialog.ui b/src/assistant/assistant/bookmarkdialog.ui
index 51315317b..51315317b 100644
--- a/src/assistant/tools/assistant/bookmarkdialog.ui
+++ b/src/assistant/assistant/bookmarkdialog.ui
diff --git a/src/assistant/tools/assistant/bookmarkfiltermodel.cpp b/src/assistant/assistant/bookmarkfiltermodel.cpp
index 412e08e5d..412e08e5d 100644
--- a/src/assistant/tools/assistant/bookmarkfiltermodel.cpp
+++ b/src/assistant/assistant/bookmarkfiltermodel.cpp
diff --git a/src/assistant/tools/assistant/bookmarkfiltermodel.h b/src/assistant/assistant/bookmarkfiltermodel.h
index 310e27512..310e27512 100644
--- a/src/assistant/tools/assistant/bookmarkfiltermodel.h
+++ b/src/assistant/assistant/bookmarkfiltermodel.h
diff --git a/src/assistant/tools/assistant/bookmarkitem.cpp b/src/assistant/assistant/bookmarkitem.cpp
index 8bcf451c1..8bcf451c1 100644
--- a/src/assistant/tools/assistant/bookmarkitem.cpp
+++ b/src/assistant/assistant/bookmarkitem.cpp
diff --git a/src/assistant/tools/assistant/bookmarkitem.h b/src/assistant/assistant/bookmarkitem.h
index 96ce786be..96ce786be 100644
--- a/src/assistant/tools/assistant/bookmarkitem.h
+++ b/src/assistant/assistant/bookmarkitem.h
diff --git a/src/assistant/tools/assistant/bookmarkmanager.cpp b/src/assistant/assistant/bookmarkmanager.cpp
index 29d8567a7..29d8567a7 100644
--- a/src/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/src/assistant/assistant/bookmarkmanager.cpp
diff --git a/src/assistant/tools/assistant/bookmarkmanager.h b/src/assistant/assistant/bookmarkmanager.h
index 0b6275af9..0b6275af9 100644
--- a/src/assistant/tools/assistant/bookmarkmanager.h
+++ b/src/assistant/assistant/bookmarkmanager.h
diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp b/src/assistant/assistant/bookmarkmanagerwidget.cpp
index 87a1f65be..87a1f65be 100644
--- a/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp
+++ b/src/assistant/assistant/bookmarkmanagerwidget.cpp
diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.h b/src/assistant/assistant/bookmarkmanagerwidget.h
index 5c461b937..5c461b937 100644
--- a/src/assistant/tools/assistant/bookmarkmanagerwidget.h
+++ b/src/assistant/assistant/bookmarkmanagerwidget.h
diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.ui b/src/assistant/assistant/bookmarkmanagerwidget.ui
index dc965d94e..dc965d94e 100644
--- a/src/assistant/tools/assistant/bookmarkmanagerwidget.ui
+++ b/src/assistant/assistant/bookmarkmanagerwidget.ui
diff --git a/src/assistant/tools/assistant/bookmarkmodel.cpp b/src/assistant/assistant/bookmarkmodel.cpp
index d27731642..d27731642 100644
--- a/src/assistant/tools/assistant/bookmarkmodel.cpp
+++ b/src/assistant/assistant/bookmarkmodel.cpp
diff --git a/src/assistant/tools/assistant/bookmarkmodel.h b/src/assistant/assistant/bookmarkmodel.h
index e23e9c41a..e23e9c41a 100644
--- a/src/assistant/tools/assistant/bookmarkmodel.h
+++ b/src/assistant/assistant/bookmarkmodel.h
diff --git a/src/assistant/tools/assistant/bookmarkwidget.ui b/src/assistant/assistant/bookmarkwidget.ui
index a31a2779c..a31a2779c 100644
--- a/src/assistant/tools/assistant/bookmarkwidget.ui
+++ b/src/assistant/assistant/bookmarkwidget.ui
diff --git a/src/assistant/tools/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp
index da27f033d..5544dcb24 100644
--- a/src/assistant/tools/assistant/centralwidget.cpp
+++ b/src/assistant/assistant/centralwidget.cpp
@@ -52,10 +52,10 @@
 
 #include <QtGui/QKeyEvent>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QPageSetupDialog>
-#include <QtWidgets/QPrintDialog>
-#include <QtWidgets/QPrintPreviewDialog>
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPageSetupDialog>
+#include <QtPrintSupport/QPrintDialog>
+#include <QtPrintSupport/QPrintPreviewDialog>
+#include <QtPrintSupport/QPrinter>
 #include <QtWidgets/QStackedWidget>
 #include <QtWidgets/QTextBrowser>
 #include <QtWidgets/QVBoxLayout>
diff --git a/src/assistant/tools/assistant/centralwidget.h b/src/assistant/assistant/centralwidget.h
index cdf132a1f..da8a799c8 100644
--- a/src/assistant/tools/assistant/centralwidget.h
+++ b/src/assistant/assistant/centralwidget.h
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
 class FindWidget;
 class HelpViewer;
 class QStackedWidget;
+class QPrinter;
 
 class TabBar : public QTabBar
 {
diff --git a/src/assistant/tools/assistant/cmdlineparser.cpp b/src/assistant/assistant/cmdlineparser.cpp
index bc498a9d3..bc498a9d3 100644
--- a/src/assistant/tools/assistant/cmdlineparser.cpp
+++ b/src/assistant/assistant/cmdlineparser.cpp
diff --git a/src/assistant/tools/assistant/cmdlineparser.h b/src/assistant/assistant/cmdlineparser.h
index f45679f66..f45679f66 100644
--- a/src/assistant/tools/assistant/cmdlineparser.h
+++ b/src/assistant/assistant/cmdlineparser.h
diff --git a/src/assistant/tools/assistant/contentwindow.cpp b/src/assistant/assistant/contentwindow.cpp
index 3fb1555e0..3fb1555e0 100644
--- a/src/assistant/tools/assistant/contentwindow.cpp
+++ b/src/assistant/assistant/contentwindow.cpp
diff --git a/src/assistant/tools/assistant/contentwindow.h b/src/assistant/assistant/contentwindow.h
index 9c7f4c24f..9c7f4c24f 100644
--- a/src/assistant/tools/assistant/contentwindow.h
+++ b/src/assistant/assistant/contentwindow.h
diff --git a/src/assistant/tools/assistant/doc/HOWTO b/src/assistant/assistant/doc/HOWTO
index a0143479e..a0143479e 100644
--- a/src/assistant/tools/assistant/doc/HOWTO
+++ b/src/assistant/assistant/doc/HOWTO
diff --git a/src/assistant/tools/assistant/doc/assistant.qdoc b/src/assistant/assistant/doc/assistant.qdoc
index 8bd7432ec..8bd7432ec 100644
--- a/src/assistant/tools/assistant/doc/assistant.qdoc
+++ b/src/assistant/assistant/doc/assistant.qdoc
diff --git a/src/assistant/tools/assistant/doc/assistant.qdocconf b/src/assistant/assistant/doc/assistant.qdocconf
index 4319b03f3..4319b03f3 100644
--- a/src/assistant/tools/assistant/doc/assistant.qdocconf
+++ b/src/assistant/assistant/doc/assistant.qdocconf
diff --git a/src/assistant/tools/assistant/doc/assistant.qhp b/src/assistant/assistant/doc/assistant.qhp
index 7ea4cdd46..7ea4cdd46 100644
--- a/src/assistant/tools/assistant/doc/assistant.qhp
+++ b/src/assistant/assistant/doc/assistant.qhp
diff --git a/src/assistant/tools/assistant/doc/classic.css b/src/assistant/assistant/doc/classic.css
index 911354035..911354035 100644
--- a/src/assistant/tools/assistant/doc/classic.css
+++ b/src/assistant/assistant/doc/classic.css
diff --git a/src/assistant/tools/assistant/doc/images/assistant-address-toolbar.png b/src/assistant/assistant/doc/images/assistant-address-toolbar.png
index 847b7debb..847b7debb 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-address-toolbar.png
+++ b/src/assistant/assistant/doc/images/assistant-address-toolbar.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-assistant.png b/src/assistant/assistant/doc/images/assistant-assistant.png
index 1ff5cc976..1ff5cc976 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-assistant.png
+++ b/src/assistant/assistant/doc/images/assistant-assistant.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-dockwidgets.png b/src/assistant/assistant/doc/images/assistant-dockwidgets.png
index 17bc064c5..17bc064c5 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-dockwidgets.png
+++ b/src/assistant/assistant/doc/images/assistant-dockwidgets.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-docwindow.png b/src/assistant/assistant/doc/images/assistant-docwindow.png
index c5bac581f..c5bac581f 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-docwindow.png
+++ b/src/assistant/assistant/doc/images/assistant-docwindow.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-examples.png b/src/assistant/assistant/doc/images/assistant-examples.png
index 47c01bcda..47c01bcda 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-examples.png
+++ b/src/assistant/assistant/doc/images/assistant-examples.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-filter-toolbar.png b/src/assistant/assistant/doc/images/assistant-filter-toolbar.png
index 4e89a79b9..4e89a79b9 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-filter-toolbar.png
+++ b/src/assistant/assistant/doc/images/assistant-filter-toolbar.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-preferences-documentation.png b/src/assistant/assistant/doc/images/assistant-preferences-documentation.png
index 790fd9a1a..790fd9a1a 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-preferences-documentation.png
+++ b/src/assistant/assistant/doc/images/assistant-preferences-documentation.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-preferences-filters.png b/src/assistant/assistant/doc/images/assistant-preferences-filters.png
index 7453dd66d..7453dd66d 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-preferences-filters.png
+++ b/src/assistant/assistant/doc/images/assistant-preferences-filters.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-preferences-fonts.png b/src/assistant/assistant/doc/images/assistant-preferences-fonts.png
index d42d190d0..d42d190d0 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-preferences-fonts.png
+++ b/src/assistant/assistant/doc/images/assistant-preferences-fonts.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-preferences-options.png b/src/assistant/assistant/doc/images/assistant-preferences-options.png
index d6624151a..d6624151a 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-preferences-options.png
+++ b/src/assistant/assistant/doc/images/assistant-preferences-options.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-search.png b/src/assistant/assistant/doc/images/assistant-search.png
index ef75c3329..ef75c3329 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-search.png
+++ b/src/assistant/assistant/doc/images/assistant-search.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-toolbar.png b/src/assistant/assistant/doc/images/assistant-toolbar.png
index 1b41825c6..1b41825c6 100644
--- a/src/assistant/tools/assistant/doc/images/assistant-toolbar.png
+++ b/src/assistant/assistant/doc/images/assistant-toolbar.png
diff --git a/src/assistant/tools/assistant/filternamedialog.cpp b/src/assistant/assistant/filternamedialog.cpp
index d1424ee2a..d1424ee2a 100644
--- a/src/assistant/tools/assistant/filternamedialog.cpp
+++ b/src/assistant/assistant/filternamedialog.cpp
diff --git a/src/assistant/tools/assistant/filternamedialog.h b/src/assistant/assistant/filternamedialog.h
index bf65a7e15..bf65a7e15 100644
--- a/src/assistant/tools/assistant/filternamedialog.h
+++ b/src/assistant/assistant/filternamedialog.h
diff --git a/src/assistant/tools/assistant/filternamedialog.ui b/src/assistant/assistant/filternamedialog.ui
index 755a93479..755a93479 100644
--- a/src/assistant/tools/assistant/filternamedialog.ui
+++ b/src/assistant/assistant/filternamedialog.ui
diff --git a/src/assistant/tools/assistant/findwidget.cpp b/src/assistant/assistant/findwidget.cpp
index 296da0c8d..296da0c8d 100644
--- a/src/assistant/tools/assistant/findwidget.cpp
+++ b/src/assistant/assistant/findwidget.cpp
diff --git a/src/assistant/tools/assistant/findwidget.h b/src/assistant/assistant/findwidget.h
index b24e88019..b24e88019 100644
--- a/src/assistant/tools/assistant/findwidget.h
+++ b/src/assistant/assistant/findwidget.h
diff --git a/src/assistant/tools/assistant/globalactions.cpp b/src/assistant/assistant/globalactions.cpp
index 6b8b8ea29..6b8b8ea29 100644
--- a/src/assistant/tools/assistant/globalactions.cpp
+++ b/src/assistant/assistant/globalactions.cpp
diff --git a/src/assistant/tools/assistant/globalactions.h b/src/assistant/assistant/globalactions.h
index a9059a9a4..a9059a9a4 100644
--- a/src/assistant/tools/assistant/globalactions.h
+++ b/src/assistant/assistant/globalactions.h
diff --git a/src/assistant/tools/assistant/helpenginewrapper.cpp b/src/assistant/assistant/helpenginewrapper.cpp
index 4c7ff5b30..4c7ff5b30 100644
--- a/src/assistant/tools/assistant/helpenginewrapper.cpp
+++ b/src/assistant/assistant/helpenginewrapper.cpp
diff --git a/src/assistant/tools/assistant/helpenginewrapper.h b/src/assistant/assistant/helpenginewrapper.h
index ff825b04a..ff825b04a 100644
--- a/src/assistant/tools/assistant/helpenginewrapper.h
+++ b/src/assistant/assistant/helpenginewrapper.h
diff --git a/src/assistant/tools/assistant/helpviewer.cpp b/src/assistant/assistant/helpviewer.cpp
index 7bed4965a..7bed4965a 100644
--- a/src/assistant/tools/assistant/helpviewer.cpp
+++ b/src/assistant/assistant/helpviewer.cpp
diff --git a/src/assistant/tools/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h
index a5f4de668..a5f4de668 100644
--- a/src/assistant/tools/assistant/helpviewer.h
+++ b/src/assistant/assistant/helpviewer.h
diff --git a/src/assistant/tools/assistant/helpviewer_p.h b/src/assistant/assistant/helpviewer_p.h
index 8beeb94b2..8beeb94b2 100644
--- a/src/assistant/tools/assistant/helpviewer_p.h
+++ b/src/assistant/assistant/helpviewer_p.h
diff --git a/src/assistant/tools/assistant/helpviewer_qtb.cpp b/src/assistant/assistant/helpviewer_qtb.cpp
index d3d128b74..d3d128b74 100644
--- a/src/assistant/tools/assistant/helpviewer_qtb.cpp
+++ b/src/assistant/assistant/helpviewer_qtb.cpp
diff --git a/src/assistant/tools/assistant/helpviewer_qwv.cpp b/src/assistant/assistant/helpviewer_qwv.cpp
index 662177631..662177631 100644
--- a/src/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/src/assistant/assistant/helpviewer_qwv.cpp
diff --git a/src/assistant/tools/assistant/images/assistant-128.png b/src/assistant/assistant/images/assistant-128.png
index f05949f6d..f05949f6d 100644
--- a/src/assistant/tools/assistant/images/assistant-128.png
+++ b/src/assistant/assistant/images/assistant-128.png
diff --git a/src/assistant/tools/assistant/images/assistant.png b/src/assistant/assistant/images/assistant.png
index ea4d1e70c..ea4d1e70c 100644
--- a/src/assistant/tools/assistant/images/assistant.png
+++ b/src/assistant/assistant/images/assistant.png
diff --git a/src/assistant/tools/assistant/images/bookmark.png b/src/assistant/assistant/images/bookmark.png
index 57e57e343..57e57e343 100644
--- a/src/assistant/tools/assistant/images/bookmark.png
+++ b/src/assistant/assistant/images/bookmark.png
diff --git a/src/assistant/tools/assistant/images/closebutton.png b/src/assistant/assistant/images/closebutton.png
index c978cf51a..c978cf51a 100644
--- a/src/assistant/tools/assistant/images/closebutton.png
+++ b/src/assistant/assistant/images/closebutton.png
diff --git a/src/assistant/tools/assistant/images/darkclosebutton.png b/src/assistant/assistant/images/darkclosebutton.png
index 1077663b2..1077663b2 100644
--- a/src/assistant/tools/assistant/images/darkclosebutton.png
+++ b/src/assistant/assistant/images/darkclosebutton.png
diff --git a/src/assistant/tools/assistant/images/mac/addtab.png b/src/assistant/assistant/images/mac/addtab.png
index 20928fb40..20928fb40 100644
--- a/src/assistant/tools/assistant/images/mac/addtab.png
+++ b/src/assistant/assistant/images/mac/addtab.png
diff --git a/src/assistant/tools/assistant/images/mac/book.png b/src/assistant/assistant/images/mac/book.png
index 7a3204c87..7a3204c87 100644
--- a/src/assistant/tools/assistant/images/mac/book.png
+++ b/src/assistant/assistant/images/mac/book.png
diff --git a/src/assistant/tools/assistant/images/mac/closetab.png b/src/assistant/assistant/images/mac/closetab.png
index ab9d669ee..ab9d669ee 100644
--- a/src/assistant/tools/assistant/images/mac/closetab.png
+++ b/src/assistant/assistant/images/mac/closetab.png
diff --git a/src/assistant/tools/assistant/images/mac/editcopy.png b/src/assistant/assistant/images/mac/editcopy.png
index f55136446..f55136446 100644
--- a/src/assistant/tools/assistant/images/mac/editcopy.png
+++ b/src/assistant/assistant/images/mac/editcopy.png
diff --git a/src/assistant/tools/assistant/images/mac/find.png b/src/assistant/assistant/images/mac/find.png
index 3561745f0..3561745f0 100644
--- a/src/assistant/tools/assistant/images/mac/find.png
+++ b/src/assistant/assistant/images/mac/find.png
diff --git a/src/assistant/tools/assistant/images/mac/home.png b/src/assistant/assistant/images/mac/home.png
index 78d94da18..78d94da18 100644
--- a/src/assistant/tools/assistant/images/mac/home.png
+++ b/src/assistant/assistant/images/mac/home.png
diff --git a/src/assistant/tools/assistant/images/mac/next.png b/src/assistant/assistant/images/mac/next.png
index a585cab80..a585cab80 100644
--- a/src/assistant/tools/assistant/images/mac/next.png
+++ b/src/assistant/assistant/images/mac/next.png
diff --git a/src/assistant/tools/assistant/images/mac/previous.png b/src/assistant/assistant/images/mac/previous.png
index 612fb34dc..612fb34dc 100644
--- a/src/assistant/tools/assistant/images/mac/previous.png
+++ b/src/assistant/assistant/images/mac/previous.png
diff --git a/src/assistant/tools/assistant/images/mac/print.png b/src/assistant/assistant/images/mac/print.png
index 10ca56c82..10ca56c82 100644
--- a/src/assistant/tools/assistant/images/mac/print.png
+++ b/src/assistant/assistant/images/mac/print.png
diff --git a/src/assistant/tools/assistant/images/mac/resetzoom.png b/src/assistant/assistant/images/mac/resetzoom.png
index 759b38296..759b38296 100644
--- a/src/assistant/tools/assistant/images/mac/resetzoom.png
+++ b/src/assistant/assistant/images/mac/resetzoom.png
diff --git a/src/assistant/tools/assistant/images/mac/synctoc.png b/src/assistant/assistant/images/mac/synctoc.png
index 067fa941b..067fa941b 100644
--- a/src/assistant/tools/assistant/images/mac/synctoc.png
+++ b/src/assistant/assistant/images/mac/synctoc.png
diff --git a/src/assistant/tools/assistant/images/mac/zoomin.png b/src/assistant/assistant/images/mac/zoomin.png
index d46f5aff0..d46f5aff0 100644
--- a/src/assistant/tools/assistant/images/mac/zoomin.png
+++ b/src/assistant/assistant/images/mac/zoomin.png
diff --git a/src/assistant/tools/assistant/images/mac/zoomout.png b/src/assistant/assistant/images/mac/zoomout.png
index 46326566d..46326566d 100644
--- a/src/assistant/tools/assistant/images/mac/zoomout.png
+++ b/src/assistant/assistant/images/mac/zoomout.png
diff --git a/src/assistant/tools/assistant/images/trolltech-logo.png b/src/assistant/assistant/images/trolltech-logo.png
index c53e744ca..c53e744ca 100644
--- a/src/assistant/tools/assistant/images/trolltech-logo.png
+++ b/src/assistant/assistant/images/trolltech-logo.png
diff --git a/src/assistant/tools/assistant/images/win/addtab.png b/src/assistant/assistant/images/win/addtab.png
index 4bb0feb92..4bb0feb92 100644
--- a/src/assistant/tools/assistant/images/win/addtab.png
+++ b/src/assistant/assistant/images/win/addtab.png
diff --git a/src/assistant/tools/assistant/images/win/book.png b/src/assistant/assistant/images/win/book.png
index 09ec4d33f..09ec4d33f 100644
--- a/src/assistant/tools/assistant/images/win/book.png
+++ b/src/assistant/assistant/images/win/book.png
diff --git a/src/assistant/tools/assistant/images/win/closetab.png b/src/assistant/assistant/images/win/closetab.png
index ef9e02086..ef9e02086 100644
--- a/src/assistant/tools/assistant/images/win/closetab.png
+++ b/src/assistant/assistant/images/win/closetab.png
diff --git a/src/assistant/tools/assistant/images/win/editcopy.png b/src/assistant/assistant/images/win/editcopy.png
index 1121b47d8..1121b47d8 100644
--- a/src/assistant/tools/assistant/images/win/editcopy.png
+++ b/src/assistant/assistant/images/win/editcopy.png
diff --git a/src/assistant/tools/assistant/images/win/find.png b/src/assistant/assistant/images/win/find.png
index 6ea35e930..6ea35e930 100644
--- a/src/assistant/tools/assistant/images/win/find.png
+++ b/src/assistant/assistant/images/win/find.png
diff --git a/src/assistant/tools/assistant/images/win/home.png b/src/assistant/assistant/images/win/home.png
index b1c6ae191..b1c6ae191 100644
--- a/src/assistant/tools/assistant/images/win/home.png
+++ b/src/assistant/assistant/images/win/home.png
diff --git a/src/assistant/tools/assistant/images/win/next.png b/src/assistant/assistant/images/win/next.png
index 8df4127a0..8df4127a0 100644
--- a/src/assistant/tools/assistant/images/win/next.png
+++ b/src/assistant/assistant/images/win/next.png
diff --git a/src/assistant/tools/assistant/images/win/previous.png b/src/assistant/assistant/images/win/previous.png
index 0780bc23d..0780bc23d 100644
--- a/src/assistant/tools/assistant/images/win/previous.png
+++ b/src/assistant/assistant/images/win/previous.png
diff --git a/src/assistant/tools/assistant/images/win/print.png b/src/assistant/assistant/images/win/print.png
index ba7c02dc1..ba7c02dc1 100644
--- a/src/assistant/tools/assistant/images/win/print.png
+++ b/src/assistant/assistant/images/win/print.png
diff --git a/src/assistant/tools/assistant/images/win/resetzoom.png b/src/assistant/assistant/images/win/resetzoom.png
index b69ae4e7f..b69ae4e7f 100644
--- a/src/assistant/tools/assistant/images/win/resetzoom.png
+++ b/src/assistant/assistant/images/win/resetzoom.png
diff --git a/src/assistant/tools/assistant/images/win/synctoc.png b/src/assistant/assistant/images/win/synctoc.png
index da301bc59..da301bc59 100644
--- a/src/assistant/tools/assistant/images/win/synctoc.png
+++ b/src/assistant/assistant/images/win/synctoc.png
diff --git a/src/assistant/tools/assistant/images/win/zoomin.png b/src/assistant/assistant/images/win/zoomin.png
index 2e586fc7b..2e586fc7b 100644
--- a/src/assistant/tools/assistant/images/win/zoomin.png
+++ b/src/assistant/assistant/images/win/zoomin.png
diff --git a/src/assistant/tools/assistant/images/win/zoomout.png b/src/assistant/assistant/images/win/zoomout.png
index a736d3934..a736d3934 100644
--- a/src/assistant/tools/assistant/images/win/zoomout.png
+++ b/src/assistant/assistant/images/win/zoomout.png
diff --git a/src/assistant/tools/assistant/images/wrap.png b/src/assistant/assistant/images/wrap.png
index 90f18d9f7..90f18d9f7 100644
--- a/src/assistant/tools/assistant/images/wrap.png
+++ b/src/assistant/assistant/images/wrap.png
diff --git a/src/assistant/tools/assistant/indexwindow.cpp b/src/assistant/assistant/indexwindow.cpp
index 069e821cd..069e821cd 100644
--- a/src/assistant/tools/assistant/indexwindow.cpp
+++ b/src/assistant/assistant/indexwindow.cpp
diff --git a/src/assistant/tools/assistant/indexwindow.h b/src/assistant/assistant/indexwindow.h
index 1873cd6e4..1873cd6e4 100644
--- a/src/assistant/tools/assistant/indexwindow.h
+++ b/src/assistant/assistant/indexwindow.h
diff --git a/src/assistant/tools/assistant/installdialog.cpp b/src/assistant/assistant/installdialog.cpp
index 82c0ccaa9..82c0ccaa9 100644
--- a/src/assistant/tools/assistant/installdialog.cpp
+++ b/src/assistant/assistant/installdialog.cpp
diff --git a/src/assistant/tools/assistant/installdialog.h b/src/assistant/assistant/installdialog.h
index 0f57b9ef0..0f57b9ef0 100644
--- a/src/assistant/tools/assistant/installdialog.h
+++ b/src/assistant/assistant/installdialog.h
diff --git a/src/assistant/tools/assistant/installdialog.ui b/src/assistant/assistant/installdialog.ui
index 21a05da77..21a05da77 100644
--- a/src/assistant/tools/assistant/installdialog.ui
+++ b/src/assistant/assistant/installdialog.ui
diff --git a/src/assistant/tools/assistant/main.cpp b/src/assistant/assistant/main.cpp
index d6e78d473..d6e78d473 100644
--- a/src/assistant/tools/assistant/main.cpp
+++ b/src/assistant/assistant/main.cpp
diff --git a/src/assistant/tools/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 18a215ecd..18a215ecd 100644
--- a/src/assistant/tools/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
diff --git a/src/assistant/tools/assistant/mainwindow.h b/src/assistant/assistant/mainwindow.h
index 1ea0bbaf2..1ea0bbaf2 100644
--- a/src/assistant/tools/assistant/mainwindow.h
+++ b/src/assistant/assistant/mainwindow.h
diff --git a/src/assistant/tools/assistant/openpagesmanager.cpp b/src/assistant/assistant/openpagesmanager.cpp
index 7bafeeafc..7bafeeafc 100644
--- a/src/assistant/tools/assistant/openpagesmanager.cpp
+++ b/src/assistant/assistant/openpagesmanager.cpp
diff --git a/src/assistant/tools/assistant/openpagesmanager.h b/src/assistant/assistant/openpagesmanager.h
index c34686c8c..c34686c8c 100644
--- a/src/assistant/tools/assistant/openpagesmanager.h
+++ b/src/assistant/assistant/openpagesmanager.h
diff --git a/src/assistant/tools/assistant/openpagesmodel.cpp b/src/assistant/assistant/openpagesmodel.cpp
index 3517693f9..3517693f9 100644
--- a/src/assistant/tools/assistant/openpagesmodel.cpp
+++ b/src/assistant/assistant/openpagesmodel.cpp
diff --git a/src/assistant/tools/assistant/openpagesmodel.h b/src/assistant/assistant/openpagesmodel.h
index dd28a7c5f..dd28a7c5f 100644
--- a/src/assistant/tools/assistant/openpagesmodel.h
+++ b/src/assistant/assistant/openpagesmodel.h
diff --git a/src/assistant/tools/assistant/openpagesswitcher.cpp b/src/assistant/assistant/openpagesswitcher.cpp
index b1f70d784..b1f70d784 100644
--- a/src/assistant/tools/assistant/openpagesswitcher.cpp
+++ b/src/assistant/assistant/openpagesswitcher.cpp
diff --git a/src/assistant/tools/assistant/openpagesswitcher.h b/src/assistant/assistant/openpagesswitcher.h
index c3e3a33ce..c3e3a33ce 100644
--- a/src/assistant/tools/assistant/openpagesswitcher.h
+++ b/src/assistant/assistant/openpagesswitcher.h
diff --git a/src/assistant/tools/assistant/openpageswidget.cpp b/src/assistant/assistant/openpageswidget.cpp
index 6947c312c..6947c312c 100644
--- a/src/assistant/tools/assistant/openpageswidget.cpp
+++ b/src/assistant/assistant/openpageswidget.cpp
diff --git a/src/assistant/tools/assistant/openpageswidget.h b/src/assistant/assistant/openpageswidget.h
index e629e4ffe..e629e4ffe 100644
--- a/src/assistant/tools/assistant/openpageswidget.h
+++ b/src/assistant/assistant/openpageswidget.h
diff --git a/src/assistant/tools/assistant/preferencesdialog.cpp b/src/assistant/assistant/preferencesdialog.cpp
index 64fc3c42d..64fc3c42d 100644
--- a/src/assistant/tools/assistant/preferencesdialog.cpp
+++ b/src/assistant/assistant/preferencesdialog.cpp
diff --git a/src/assistant/tools/assistant/preferencesdialog.h b/src/assistant/assistant/preferencesdialog.h
index 04bfcf8c3..04bfcf8c3 100644
--- a/src/assistant/tools/assistant/preferencesdialog.h
+++ b/src/assistant/assistant/preferencesdialog.h
diff --git a/src/assistant/tools/assistant/preferencesdialog.ui b/src/assistant/assistant/preferencesdialog.ui
index 1c6833ad9..1c6833ad9 100644
--- a/src/assistant/tools/assistant/preferencesdialog.ui
+++ b/src/assistant/assistant/preferencesdialog.ui
diff --git a/src/assistant/tools/assistant/qtdocinstaller.cpp b/src/assistant/assistant/qtdocinstaller.cpp
index ffe352c87..ffe352c87 100644
--- a/src/assistant/tools/assistant/qtdocinstaller.cpp
+++ b/src/assistant/assistant/qtdocinstaller.cpp
diff --git a/src/assistant/tools/assistant/qtdocinstaller.h b/src/assistant/assistant/qtdocinstaller.h
index 909df10ce..909df10ce 100644
--- a/src/assistant/tools/assistant/qtdocinstaller.h
+++ b/src/assistant/assistant/qtdocinstaller.h
diff --git a/src/assistant/tools/assistant/remotecontrol.cpp b/src/assistant/assistant/remotecontrol.cpp
index 0990a357f..0990a357f 100644
--- a/src/assistant/tools/assistant/remotecontrol.cpp
+++ b/src/assistant/assistant/remotecontrol.cpp
diff --git a/src/assistant/tools/assistant/remotecontrol.h b/src/assistant/assistant/remotecontrol.h
index 4a185f050..4a185f050 100644
--- a/src/assistant/tools/assistant/remotecontrol.h
+++ b/src/assistant/assistant/remotecontrol.h
diff --git a/src/assistant/tools/assistant/remotecontrol_win.h b/src/assistant/assistant/remotecontrol_win.h
index 807815df1..807815df1 100644
--- a/src/assistant/tools/assistant/remotecontrol_win.h
+++ b/src/assistant/assistant/remotecontrol_win.h
diff --git a/src/assistant/tools/assistant/searchwidget.cpp b/src/assistant/assistant/searchwidget.cpp
index 31b8e739d..31b8e739d 100644
--- a/src/assistant/tools/assistant/searchwidget.cpp
+++ b/src/assistant/assistant/searchwidget.cpp
diff --git a/src/assistant/tools/assistant/searchwidget.h b/src/assistant/assistant/searchwidget.h
index c53498c94..c53498c94 100644
--- a/src/assistant/tools/assistant/searchwidget.h
+++ b/src/assistant/assistant/searchwidget.h
diff --git a/src/assistant/tools/assistant/topicchooser.cpp b/src/assistant/assistant/topicchooser.cpp
index 6f2810bf4..6f2810bf4 100644
--- a/src/assistant/tools/assistant/topicchooser.cpp
+++ b/src/assistant/assistant/topicchooser.cpp
diff --git a/src/assistant/tools/assistant/topicchooser.h b/src/assistant/assistant/topicchooser.h
index 6ac59f008..6ac59f008 100644
--- a/src/assistant/tools/assistant/topicchooser.h
+++ b/src/assistant/assistant/topicchooser.h
diff --git a/src/assistant/tools/assistant/topicchooser.ui b/src/assistant/assistant/topicchooser.ui
index d4c90bb4b..d4c90bb4b 100644
--- a/src/assistant/tools/assistant/topicchooser.ui
+++ b/src/assistant/assistant/topicchooser.ui
diff --git a/src/assistant/tools/assistant/tracer.h b/src/assistant/assistant/tracer.h
index 1ed609acb..1ed609acb 100644
--- a/src/assistant/tools/assistant/tracer.h
+++ b/src/assistant/assistant/tracer.h
diff --git a/src/assistant/tools/assistant/xbelsupport.cpp b/src/assistant/assistant/xbelsupport.cpp
index 2979d10c1..2979d10c1 100644
--- a/src/assistant/tools/assistant/xbelsupport.cpp
+++ b/src/assistant/assistant/xbelsupport.cpp
diff --git a/src/assistant/tools/assistant/xbelsupport.h b/src/assistant/assistant/xbelsupport.h
index 4c2a211ad..f55d3ba82 100644
--- a/src/assistant/tools/assistant/xbelsupport.h
+++ b/src/assistant/assistant/xbelsupport.h
@@ -42,7 +42,7 @@
 #ifndef XBELSUPPORT_H
 #define XBELSUPPORT_H
 
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 #include <QtCore/QPersistentModelIndex>
 
 QT_FORWARD_DECLARE_CLASS(QIODevice)
diff --git a/src/assistant/lib/fulltextsearch/fulltextsearch.pro b/src/assistant/clucene/clucene.pro
index 8733e57d7..51ada580f 100644
--- a/src/assistant/lib/fulltextsearch/fulltextsearch.pro
+++ b/src/assistant/clucene/clucene.pro
@@ -1,21 +1,16 @@
 load(qt_module)
 
-QMAKE_TARGET_PRODUCT = QtCLucene
-QMAKE_TARGET_DESCRIPTION = QtCLucene full text search library wrapper.
-#if qt is built with frameworks in debug, we must build QtCLucene in debug and release 
-#that's a similar logic as in qbase.pri 
-mac:!static:contains(QT_CONFIG, qt_framework) { 
-   CONFIG(debug, debug|release) { 
-      !build_pass:CONFIG += build_all 
-   } 
-}
-QT_CONFIG -= qt_framework 
-QT -= gui
-TEMPLATE = lib
 TARGET = QtCLucene
+QPRO_PWD = $$PWD
+
+CONFIG += module
+MODULE_PRI = ../../../modules/qt_clucene.pri
+
+QT = core
+
 DEFINES += QHELP_LIB
-include($$QT_SOURCE_TREE/src/qbase.pri)
 
+load(qt_module_config)
 HEADERS += qtcluceneversion.h
 
 include(fulltextsearch.pri)
diff --git a/src/assistant/lib/fulltextsearch/fulltextsearch.pri b/src/assistant/clucene/fulltextsearch.pri
index aac2ec6eb..eebfba33a 100644
--- a/src/assistant/lib/fulltextsearch/fulltextsearch.pri
+++ b/src/assistant/clucene/fulltextsearch.pri
@@ -1,7 +1,7 @@
 DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
 win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
 
-CLUCENEDIR = ../../../../3rdparty/clucene/src/CLucene
+CLUCENEDIR = ../3rdparty/clucene/src/CLucene
 
 INCLUDEPATH += . .. \
                $$CLUCENEDIR \
diff --git a/src/assistant/lib/fulltextsearch/license.txt b/src/assistant/clucene/license.txt
index 9ef3d701d..9ef3d701d 100644
--- a/src/assistant/lib/fulltextsearch/license.txt
+++ b/src/assistant/clucene/license.txt
diff --git a/src/assistant/lib/fulltextsearch/qanalyzer.cpp b/src/assistant/clucene/qanalyzer.cpp
index 71dd2c972..71dd2c972 100644
--- a/src/assistant/lib/fulltextsearch/qanalyzer.cpp
+++ b/src/assistant/clucene/qanalyzer.cpp
diff --git a/src/assistant/lib/fulltextsearch/qanalyzer_p.h b/src/assistant/clucene/qanalyzer_p.h
index 162d6799b..162d6799b 100644
--- a/src/assistant/lib/fulltextsearch/qanalyzer_p.h
+++ b/src/assistant/clucene/qanalyzer_p.h
diff --git a/src/assistant/lib/fulltextsearch/qclucene-config_p.h b/src/assistant/clucene/qclucene-config_p.h
index 476296cf5..476296cf5 100644
--- a/src/assistant/lib/fulltextsearch/qclucene-config_p.h
+++ b/src/assistant/clucene/qclucene-config_p.h
diff --git a/src/assistant/lib/fulltextsearch/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h
index 887b113e5..887b113e5 100644
--- a/src/assistant/lib/fulltextsearch/qclucene_global_p.h
+++ b/src/assistant/clucene/qclucene_global_p.h
diff --git a/src/assistant/lib/fulltextsearch/qdocument.cpp b/src/assistant/clucene/qdocument.cpp
index 3c4cc068d..3c4cc068d 100644
--- a/src/assistant/lib/fulltextsearch/qdocument.cpp
+++ b/src/assistant/clucene/qdocument.cpp
diff --git a/src/assistant/lib/fulltextsearch/qdocument_p.h b/src/assistant/clucene/qdocument_p.h
index 31369af2a..31369af2a 100644
--- a/src/assistant/lib/fulltextsearch/qdocument_p.h
+++ b/src/assistant/clucene/qdocument_p.h
diff --git a/src/assistant/lib/fulltextsearch/qfield.cpp b/src/assistant/clucene/qfield.cpp
index 448acf0e6..448acf0e6 100644
--- a/src/assistant/lib/fulltextsearch/qfield.cpp
+++ b/src/assistant/clucene/qfield.cpp
diff --git a/src/assistant/lib/fulltextsearch/qfield_p.h b/src/assistant/clucene/qfield_p.h
index 39f2ff308..39f2ff308 100644
--- a/src/assistant/lib/fulltextsearch/qfield_p.h
+++ b/src/assistant/clucene/qfield_p.h
diff --git a/src/assistant/lib/fulltextsearch/qfilter.cpp b/src/assistant/clucene/qfilter.cpp
index 4807193ff..4807193ff 100644
--- a/src/assistant/lib/fulltextsearch/qfilter.cpp
+++ b/src/assistant/clucene/qfilter.cpp
diff --git a/src/assistant/lib/fulltextsearch/qfilter_p.h b/src/assistant/clucene/qfilter_p.h
index 67f6615b1..67f6615b1 100644
--- a/src/assistant/lib/fulltextsearch/qfilter_p.h
+++ b/src/assistant/clucene/qfilter_p.h
diff --git a/src/assistant/lib/fulltextsearch/qhits.cpp b/src/assistant/clucene/qhits.cpp
index 5223a743d..5223a743d 100644
--- a/src/assistant/lib/fulltextsearch/qhits.cpp
+++ b/src/assistant/clucene/qhits.cpp
diff --git a/src/assistant/lib/fulltextsearch/qhits_p.h b/src/assistant/clucene/qhits_p.h
index 98cd7021a..98cd7021a 100644
--- a/src/assistant/lib/fulltextsearch/qhits_p.h
+++ b/src/assistant/clucene/qhits_p.h
diff --git a/src/assistant/lib/fulltextsearch/qindexreader.cpp b/src/assistant/clucene/qindexreader.cpp
index 285a96334..285a96334 100644
--- a/src/assistant/lib/fulltextsearch/qindexreader.cpp
+++ b/src/assistant/clucene/qindexreader.cpp
diff --git a/src/assistant/lib/fulltextsearch/qindexreader_p.h b/src/assistant/clucene/qindexreader_p.h
index 7421daa17..7421daa17 100644
--- a/src/assistant/lib/fulltextsearch/qindexreader_p.h
+++ b/src/assistant/clucene/qindexreader_p.h
diff --git a/src/assistant/lib/fulltextsearch/qindexwriter.cpp b/src/assistant/clucene/qindexwriter.cpp
index 1f579eb65..1f579eb65 100644
--- a/src/assistant/lib/fulltextsearch/qindexwriter.cpp
+++ b/src/assistant/clucene/qindexwriter.cpp
diff --git a/src/assistant/lib/fulltextsearch/qindexwriter_p.h b/src/assistant/clucene/qindexwriter_p.h
index 1f9c86115..1f9c86115 100644
--- a/src/assistant/lib/fulltextsearch/qindexwriter_p.h
+++ b/src/assistant/clucene/qindexwriter_p.h
diff --git a/src/assistant/lib/fulltextsearch/qquery.cpp b/src/assistant/clucene/qquery.cpp
index 170341cdd..170341cdd 100644
--- a/src/assistant/lib/fulltextsearch/qquery.cpp
+++ b/src/assistant/clucene/qquery.cpp
diff --git a/src/assistant/lib/fulltextsearch/qquery_p.h b/src/assistant/clucene/qquery_p.h
index 3268b7c42..3268b7c42 100644
--- a/src/assistant/lib/fulltextsearch/qquery_p.h
+++ b/src/assistant/clucene/qquery_p.h
diff --git a/src/assistant/lib/fulltextsearch/qqueryparser.cpp b/src/assistant/clucene/qqueryparser.cpp
index f306a041b..f306a041b 100644
--- a/src/assistant/lib/fulltextsearch/qqueryparser.cpp
+++ b/src/assistant/clucene/qqueryparser.cpp
diff --git a/src/assistant/lib/fulltextsearch/qqueryparser_p.h b/src/assistant/clucene/qqueryparser_p.h
index e1b8c74eb..e1b8c74eb 100644
--- a/src/assistant/lib/fulltextsearch/qqueryparser_p.h
+++ b/src/assistant/clucene/qqueryparser_p.h
diff --git a/src/assistant/lib/fulltextsearch/qreader.cpp b/src/assistant/clucene/qreader.cpp
index 0a8b7accf..0a8b7accf 100644
--- a/src/assistant/lib/fulltextsearch/qreader.cpp
+++ b/src/assistant/clucene/qreader.cpp
diff --git a/src/assistant/lib/fulltextsearch/qreader_p.h b/src/assistant/clucene/qreader_p.h
index e24e9d836..e24e9d836 100644
--- a/src/assistant/lib/fulltextsearch/qreader_p.h
+++ b/src/assistant/clucene/qreader_p.h
diff --git a/src/assistant/lib/fulltextsearch/qsearchable.cpp b/src/assistant/clucene/qsearchable.cpp
index 508fc05f6..508fc05f6 100644
--- a/src/assistant/lib/fulltextsearch/qsearchable.cpp
+++ b/src/assistant/clucene/qsearchable.cpp
diff --git a/src/assistant/lib/fulltextsearch/qsearchable_p.h b/src/assistant/clucene/qsearchable_p.h
index 149cfb049..149cfb049 100644
--- a/src/assistant/lib/fulltextsearch/qsearchable_p.h
+++ b/src/assistant/clucene/qsearchable_p.h
diff --git a/src/assistant/lib/fulltextsearch/qsort.cpp b/src/assistant/clucene/qsort.cpp
index 4dface005..4dface005 100644
--- a/src/assistant/lib/fulltextsearch/qsort.cpp
+++ b/src/assistant/clucene/qsort.cpp
diff --git a/src/assistant/lib/fulltextsearch/qsort_p.h b/src/assistant/clucene/qsort_p.h
index 5d9372b11..5d9372b11 100644
--- a/src/assistant/lib/fulltextsearch/qsort_p.h
+++ b/src/assistant/clucene/qsort_p.h
diff --git a/src/assistant/lib/fulltextsearch/qterm.cpp b/src/assistant/clucene/qterm.cpp
index eeebf53c8..eeebf53c8 100644
--- a/src/assistant/lib/fulltextsearch/qterm.cpp
+++ b/src/assistant/clucene/qterm.cpp
diff --git a/src/assistant/lib/fulltextsearch/qterm_p.h b/src/assistant/clucene/qterm_p.h
index 5b981dc53..5b981dc53 100644
--- a/src/assistant/lib/fulltextsearch/qterm_p.h
+++ b/src/assistant/clucene/qterm_p.h
diff --git a/src/assistant/lib/fulltextsearch/qtoken.cpp b/src/assistant/clucene/qtoken.cpp
index 537d9e675..537d9e675 100644
--- a/src/assistant/lib/fulltextsearch/qtoken.cpp
+++ b/src/assistant/clucene/qtoken.cpp
diff --git a/src/assistant/lib/fulltextsearch/qtoken_p.h b/src/assistant/clucene/qtoken_p.h
index f3d25c4ff..f3d25c4ff 100644
--- a/src/assistant/lib/fulltextsearch/qtoken_p.h
+++ b/src/assistant/clucene/qtoken_p.h
diff --git a/src/assistant/lib/fulltextsearch/qtokenizer.cpp b/src/assistant/clucene/qtokenizer.cpp
index 8a79b21e6..8a79b21e6 100644
--- a/src/assistant/lib/fulltextsearch/qtokenizer.cpp
+++ b/src/assistant/clucene/qtokenizer.cpp
diff --git a/src/assistant/lib/fulltextsearch/qtokenizer_p.h b/src/assistant/clucene/qtokenizer_p.h
index 0c6e8ea1d..0c6e8ea1d 100644
--- a/src/assistant/lib/fulltextsearch/qtokenizer_p.h
+++ b/src/assistant/clucene/qtokenizer_p.h
diff --git a/src/assistant/lib/fulltextsearch/qtokenstream.cpp b/src/assistant/clucene/qtokenstream.cpp
index 337ebf1e3..337ebf1e3 100644
--- a/src/assistant/lib/fulltextsearch/qtokenstream.cpp
+++ b/src/assistant/clucene/qtokenstream.cpp
diff --git a/src/assistant/lib/fulltextsearch/qtokenstream_p.h b/src/assistant/clucene/qtokenstream_p.h
index 8f4b9d06a..8f4b9d06a 100644
--- a/src/assistant/lib/fulltextsearch/qtokenstream_p.h
+++ b/src/assistant/clucene/qtokenstream_p.h
diff --git a/src/assistant/lib/lib.pro b/src/assistant/help/help.pro
index 280c77915..2aa30992e 100644
--- a/src/assistant/lib/lib.pro
+++ b/src/assistant/help/help.pro
@@ -1,39 +1,28 @@
 load(qt_module)
 
-QT += widgets \
-    sql \
-    xml \
-    network \
-    core-private
-TEMPLATE = lib
 TARGET = QtHelp
+QPRO_PWD = $$PWD
+QT += widgets sql network core-private clucene clucene-private
 
 CONFIG += module
 MODULE_PRI += ../../../modules/qt_help.pri
 
-DEFINES += QHELP_LIB \
-    QT_CLUCENE_SUPPORT
-CONFIG += qt \
-    warn_on
-include($$QT_SOURCE_TREE/src/qbase.pri)
+DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT
+
+load(qt_module_config)
 
 HEADERS += qthelpversion.h
 
-QMAKE_TARGET_PRODUCT = Help
-QMAKE_TARGET_DESCRIPTION = Help \
-    application \
-    framework.
 DEFINES -= QT_ASCII_CAST_WARNINGS
-INCLUDEPATH += $$QT.help.includes
+
 qclucene = QtCLucene$${QT_LIBINFIX}
 if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { 
     mac:qclucene = $${qclucene}_debug
     win32:qclucene = $${qclucene}d
 }
 linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
-    QtSql \
-    QtXml
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtCore QtNetwork QtSql 
+
 LIBS_PRIVATE += -l$$qclucene
 RESOURCES += helpsystem.qrc
 SOURCES += qhelpenginecore.cpp \
diff --git a/src/assistant/lib/helpsystem.qrc b/src/assistant/help/helpsystem.qrc
index 10efc6df1..10efc6df1 100644
--- a/src/assistant/lib/helpsystem.qrc
+++ b/src/assistant/help/helpsystem.qrc
diff --git a/src/assistant/lib/images/1leftarrow.png b/src/assistant/help/images/1leftarrow.png
index bd1a5a249..bd1a5a249 100644
--- a/src/assistant/lib/images/1leftarrow.png
+++ b/src/assistant/help/images/1leftarrow.png
diff --git a/src/assistant/lib/images/1rightarrow.png b/src/assistant/help/images/1rightarrow.png
index 0c0c44ae6..0c0c44ae6 100644
--- a/src/assistant/lib/images/1rightarrow.png
+++ b/src/assistant/help/images/1rightarrow.png
diff --git a/src/assistant/lib/images/3leftarrow.png b/src/assistant/help/images/3leftarrow.png
index 8d38b0f57..8d38b0f57 100644
--- a/src/assistant/lib/images/3leftarrow.png
+++ b/src/assistant/help/images/3leftarrow.png
diff --git a/src/assistant/lib/images/3rightarrow.png b/src/assistant/help/images/3rightarrow.png
index c2faf501c..c2faf501c 100644
--- a/src/assistant/lib/images/3rightarrow.png
+++ b/src/assistant/help/images/3rightarrow.png
diff --git a/src/assistant/lib/qclucenefieldnames.cpp b/src/assistant/help/qclucenefieldnames.cpp
index 31ef415af..31ef415af 100644
--- a/src/assistant/lib/qclucenefieldnames.cpp
+++ b/src/assistant/help/qclucenefieldnames.cpp
diff --git a/src/assistant/lib/qclucenefieldnames_p.h b/src/assistant/help/qclucenefieldnames_p.h
index 733e27121..733e27121 100644
--- a/src/assistant/lib/qclucenefieldnames_p.h
+++ b/src/assistant/help/qclucenefieldnames_p.h
diff --git a/src/assistant/lib/qhelp_global.cpp b/src/assistant/help/qhelp_global.cpp
index 2c7ca6214..2c7ca6214 100644
--- a/src/assistant/lib/qhelp_global.cpp
+++ b/src/assistant/help/qhelp_global.cpp
diff --git a/src/assistant/lib/qhelp_global.h b/src/assistant/help/qhelp_global.h
index 182298fc2..182298fc2 100644
--- a/src/assistant/lib/qhelp_global.h
+++ b/src/assistant/help/qhelp_global.h
diff --git a/src/assistant/lib/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp
index 169d37e05..169d37e05 100644
--- a/src/assistant/lib/qhelpcollectionhandler.cpp
+++ b/src/assistant/help/qhelpcollectionhandler.cpp
diff --git a/src/assistant/lib/qhelpcollectionhandler_p.h b/src/assistant/help/qhelpcollectionhandler_p.h
index a97af8fa9..a97af8fa9 100644
--- a/src/assistant/lib/qhelpcollectionhandler_p.h
+++ b/src/assistant/help/qhelpcollectionhandler_p.h
diff --git a/src/assistant/lib/qhelpcontentwidget.cpp b/src/assistant/help/qhelpcontentwidget.cpp
index 7e3cb93d1..7e3cb93d1 100644
--- a/src/assistant/lib/qhelpcontentwidget.cpp
+++ b/src/assistant/help/qhelpcontentwidget.cpp
diff --git a/src/assistant/lib/qhelpcontentwidget.h b/src/assistant/help/qhelpcontentwidget.h
index ab7d80a43..ab7d80a43 100644
--- a/src/assistant/lib/qhelpcontentwidget.h
+++ b/src/assistant/help/qhelpcontentwidget.h
diff --git a/src/assistant/lib/qhelpdatainterface.cpp b/src/assistant/help/qhelpdatainterface.cpp
index d3f07c756..d3f07c756 100644
--- a/src/assistant/lib/qhelpdatainterface.cpp
+++ b/src/assistant/help/qhelpdatainterface.cpp
diff --git a/src/assistant/lib/qhelpdatainterface_p.h b/src/assistant/help/qhelpdatainterface_p.h
index 886d68650..886d68650 100644
--- a/src/assistant/lib/qhelpdatainterface_p.h
+++ b/src/assistant/help/qhelpdatainterface_p.h
diff --git a/src/assistant/lib/qhelpdbreader.cpp b/src/assistant/help/qhelpdbreader.cpp
index c4735f8b8..c4735f8b8 100644
--- a/src/assistant/lib/qhelpdbreader.cpp
+++ b/src/assistant/help/qhelpdbreader.cpp
diff --git a/src/assistant/lib/qhelpdbreader_p.h b/src/assistant/help/qhelpdbreader_p.h
index 5fdf2e90b..5fdf2e90b 100644
--- a/src/assistant/lib/qhelpdbreader_p.h
+++ b/src/assistant/help/qhelpdbreader_p.h
diff --git a/src/assistant/lib/qhelpengine.cpp b/src/assistant/help/qhelpengine.cpp
index 007cc84a9..007cc84a9 100644
--- a/src/assistant/lib/qhelpengine.cpp
+++ b/src/assistant/help/qhelpengine.cpp
diff --git a/src/assistant/lib/qhelpengine.h b/src/assistant/help/qhelpengine.h
index cc0bca299..cc0bca299 100644
--- a/src/assistant/lib/qhelpengine.h
+++ b/src/assistant/help/qhelpengine.h
diff --git a/src/assistant/lib/qhelpengine_p.h b/src/assistant/help/qhelpengine_p.h
index 5a7c30184..5a7c30184 100644
--- a/src/assistant/lib/qhelpengine_p.h
+++ b/src/assistant/help/qhelpengine_p.h
diff --git a/src/assistant/lib/qhelpenginecore.cpp b/src/assistant/help/qhelpenginecore.cpp
index 178e11ee6..178e11ee6 100644
--- a/src/assistant/lib/qhelpenginecore.cpp
+++ b/src/assistant/help/qhelpenginecore.cpp
diff --git a/src/assistant/lib/qhelpenginecore.h b/src/assistant/help/qhelpenginecore.h
index fbfb8a0e8..fbfb8a0e8 100644
--- a/src/assistant/lib/qhelpenginecore.h
+++ b/src/assistant/help/qhelpenginecore.h
diff --git a/src/assistant/lib/qhelpgenerator.cpp b/src/assistant/help/qhelpgenerator.cpp
index ce9c8562d..ce9c8562d 100644
--- a/src/assistant/lib/qhelpgenerator.cpp
+++ b/src/assistant/help/qhelpgenerator.cpp
diff --git a/src/assistant/lib/qhelpgenerator_p.h b/src/assistant/help/qhelpgenerator_p.h
index ad32c05de..ad32c05de 100644
--- a/src/assistant/lib/qhelpgenerator_p.h
+++ b/src/assistant/help/qhelpgenerator_p.h
diff --git a/src/assistant/lib/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp
index 1b34ca0aa..1b34ca0aa 100644
--- a/src/assistant/lib/qhelpindexwidget.cpp
+++ b/src/assistant/help/qhelpindexwidget.cpp
diff --git a/src/assistant/lib/qhelpindexwidget.h b/src/assistant/help/qhelpindexwidget.h
index 41e66f647..41e66f647 100644
--- a/src/assistant/lib/qhelpindexwidget.h
+++ b/src/assistant/help/qhelpindexwidget.h
diff --git a/src/assistant/lib/qhelpprojectdata.cpp b/src/assistant/help/qhelpprojectdata.cpp
index bd59e289c..ce0ddd720 100644
--- a/src/assistant/lib/qhelpprojectdata.cpp
+++ b/src/assistant/help/qhelpprojectdata.cpp
@@ -49,7 +49,7 @@
 #include <QtCore/QRegExp>
 #include <QtCore/QUrl>
 #include <QtCore/QVariant>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/assistant/lib/qhelpprojectdata_p.h b/src/assistant/help/qhelpprojectdata_p.h
index 64ae32505..64ae32505 100644
--- a/src/assistant/lib/qhelpprojectdata_p.h
+++ b/src/assistant/help/qhelpprojectdata_p.h
diff --git a/src/assistant/lib/qhelpsearchengine.cpp b/src/assistant/help/qhelpsearchengine.cpp
index f8f8acf44..f8f8acf44 100644
--- a/src/assistant/lib/qhelpsearchengine.cpp
+++ b/src/assistant/help/qhelpsearchengine.cpp
diff --git a/src/assistant/lib/qhelpsearchengine.h b/src/assistant/help/qhelpsearchengine.h
index baceb7057..baceb7057 100644
--- a/src/assistant/lib/qhelpsearchengine.h
+++ b/src/assistant/help/qhelpsearchengine.h
diff --git a/src/assistant/lib/qhelpsearchindex_default.cpp b/src/assistant/help/qhelpsearchindex_default.cpp
index 9974f618d..9974f618d 100644
--- a/src/assistant/lib/qhelpsearchindex_default.cpp
+++ b/src/assistant/help/qhelpsearchindex_default.cpp
diff --git a/src/assistant/lib/qhelpsearchindex_default_p.h b/src/assistant/help/qhelpsearchindex_default_p.h
index 868609960..868609960 100644
--- a/src/assistant/lib/qhelpsearchindex_default_p.h
+++ b/src/assistant/help/qhelpsearchindex_default_p.h
diff --git a/src/assistant/lib/qhelpsearchindexreader.cpp b/src/assistant/help/qhelpsearchindexreader.cpp
index 1ee356d2f..1ee356d2f 100644
--- a/src/assistant/lib/qhelpsearchindexreader.cpp
+++ b/src/assistant/help/qhelpsearchindexreader.cpp
diff --git a/src/assistant/lib/qhelpsearchindexreader_clucene.cpp b/src/assistant/help/qhelpsearchindexreader_clucene.cpp
index 537e1d765..b67898f8a 100644
--- a/src/assistant/lib/qhelpsearchindexreader_clucene.cpp
+++ b/src/assistant/help/qhelpsearchindexreader_clucene.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "fulltextsearch/qindexreader_p.h"
-#include "fulltextsearch/qqueryparser_p.h"
-#include "fulltextsearch/qsearchable_p.h"
+#include "private/qindexreader_p.h"
+#include "private/qqueryparser_p.h"
+#include "private/qsearchable_p.h"
 #include "qclucenefieldnames_p.h"
 #include "qhelpenginecore.h"
 
diff --git a/src/assistant/lib/qhelpsearchindexreader_clucene_p.h b/src/assistant/help/qhelpsearchindexreader_clucene_p.h
index dec18a07b..1e3d199ed 100644
--- a/src/assistant/lib/qhelpsearchindexreader_clucene_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_clucene_p.h
@@ -57,8 +57,8 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-#include "fulltextsearch/qanalyzer_p.h"
-#include "fulltextsearch/qquery_p.h"
+#include "private/qanalyzer_p.h"
+#include "private/qquery_p.h"
 #include "qhelpsearchindexreader_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/assistant/lib/qhelpsearchindexreader_default.cpp b/src/assistant/help/qhelpsearchindexreader_default.cpp
index e49fdfcbd..e49fdfcbd 100644
--- a/src/assistant/lib/qhelpsearchindexreader_default.cpp
+++ b/src/assistant/help/qhelpsearchindexreader_default.cpp
diff --git a/src/assistant/lib/qhelpsearchindexreader_default_p.h b/src/assistant/help/qhelpsearchindexreader_default_p.h
index 30dfe1ed6..30dfe1ed6 100644
--- a/src/assistant/lib/qhelpsearchindexreader_default_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_default_p.h
diff --git a/src/assistant/lib/qhelpsearchindexreader_p.h b/src/assistant/help/qhelpsearchindexreader_p.h
index 0d7518a6e..0d7518a6e 100644
--- a/src/assistant/lib/qhelpsearchindexreader_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_p.h
diff --git a/src/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
index f3d5e4fc3..287151338 100644
--- a/src/assistant/lib/qhelpsearchindexwriter_clucene.cpp
+++ b/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
@@ -42,13 +42,13 @@
 #include "qclucenefieldnames_p.h"
 #include "qhelpenginecore.h"
 #include "qhelp_global.h"
-#include "fulltextsearch/qhits_p.h"
-#include "fulltextsearch/qquery_p.h"
-#include "fulltextsearch/qanalyzer_p.h"
-#include "fulltextsearch/qdocument_p.h"
-#include "fulltextsearch/qsearchable_p.h"
-#include "fulltextsearch/qindexreader_p.h"
-#include "fulltextsearch/qindexwriter_p.h"
+#include "private/qhits_p.h"
+#include "private/qquery_p.h"
+#include "private/qanalyzer_p.h"
+#include "private/qdocument_p.h"
+#include "private/qsearchable_p.h"
+#include "private/qindexreader_p.h"
+#include "private/qindexwriter_p.h"
 #include "qhelpsearchindexwriter_clucene_p.h"
 
 #include <QtCore/QDir>
diff --git a/src/assistant/lib/qhelpsearchindexwriter_clucene_p.h b/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
index 89146f5a7..7c9a91468 100644
--- a/src/assistant/lib/qhelpsearchindexwriter_clucene_p.h
+++ b/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qhelpenginecore.h"
-#include "fulltextsearch/qanalyzer_p.h"
+#include "private/qanalyzer_p.h"
 
 #include <QtCore/QUrl>
 #include <QtCore/QThread>
diff --git a/src/assistant/lib/qhelpsearchindexwriter_default.cpp b/src/assistant/help/qhelpsearchindexwriter_default.cpp
index db7f6ba0d..db7f6ba0d 100644
--- a/src/assistant/lib/qhelpsearchindexwriter_default.cpp
+++ b/src/assistant/help/qhelpsearchindexwriter_default.cpp
diff --git a/src/assistant/lib/qhelpsearchindexwriter_default_p.h b/src/assistant/help/qhelpsearchindexwriter_default_p.h
index d510fbc9d..d510fbc9d 100644
--- a/src/assistant/lib/qhelpsearchindexwriter_default_p.h
+++ b/src/assistant/help/qhelpsearchindexwriter_default_p.h
diff --git a/src/assistant/lib/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index 55974ada5..55974ada5 100644
--- a/src/assistant/lib/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
diff --git a/src/assistant/lib/qhelpsearchquerywidget.h b/src/assistant/help/qhelpsearchquerywidget.h
index e438df0b5..e438df0b5 100644
--- a/src/assistant/lib/qhelpsearchquerywidget.h
+++ b/src/assistant/help/qhelpsearchquerywidget.h
diff --git a/src/assistant/lib/qhelpsearchresultwidget.cpp b/src/assistant/help/qhelpsearchresultwidget.cpp
index 964185b5e..964185b5e 100644
--- a/src/assistant/lib/qhelpsearchresultwidget.cpp
+++ b/src/assistant/help/qhelpsearchresultwidget.cpp
diff --git a/src/assistant/lib/qhelpsearchresultwidget.h b/src/assistant/help/qhelpsearchresultwidget.h
index f9300e979..f9300e979 100644
--- a/src/assistant/lib/qhelpsearchresultwidget.h
+++ b/src/assistant/help/qhelpsearchresultwidget.h
diff --git a/src/assistant/tools/qcollectiongenerator/main.cpp b/src/assistant/qcollectiongenerator/main.cpp
index 058d4281a..87bdf7996 100644
--- a/src/assistant/tools/qcollectiongenerator/main.cpp
+++ b/src/assistant/qcollectiongenerator/main.cpp
@@ -55,7 +55,7 @@
 #include <QtCore/QLocale>
 #include <QtCore/QLibraryInfo>
 #include <QtHelp/QHelpEngineCore>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 
 QT_USE_NAMESPACE
diff --git a/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro b/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
index 23d32c698..e8df8e4f6 100644
--- a/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
+++ b/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
@@ -1,6 +1,4 @@
-QT += xml \
-    network \
-    help-private
+QT += network help-private
 TEMPLATE = app
 DESTDIR = $$QT.designer.bins
 TARGET = qcollectiongenerator
diff --git a/src/assistant/tools/qhelpconverter/adpreader.cpp b/src/assistant/qhelpconverter/adpreader.cpp
index a0983755e..a0983755e 100644
--- a/src/assistant/tools/qhelpconverter/adpreader.cpp
+++ b/src/assistant/qhelpconverter/adpreader.cpp
diff --git a/src/assistant/tools/qhelpconverter/adpreader.h b/src/assistant/qhelpconverter/adpreader.h
index f0b6ae214..9900866c9 100644
--- a/src/assistant/tools/qhelpconverter/adpreader.h
+++ b/src/assistant/qhelpconverter/adpreader.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/QMap>
 #include <QtCore/QSet>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/assistant/tools/qhelpconverter/assistant-128.png b/src/assistant/qhelpconverter/assistant-128.png
index f05949f6d..f05949f6d 100644
--- a/src/assistant/tools/qhelpconverter/assistant-128.png
+++ b/src/assistant/qhelpconverter/assistant-128.png
diff --git a/src/assistant/tools/qhelpconverter/assistant.png b/src/assistant/qhelpconverter/assistant.png
index ea4d1e70c..ea4d1e70c 100644
--- a/src/assistant/tools/qhelpconverter/assistant.png
+++ b/src/assistant/qhelpconverter/assistant.png
diff --git a/src/assistant/tools/qhelpconverter/conversionwizard.cpp b/src/assistant/qhelpconverter/conversionwizard.cpp
index 0a80a0e71..0a80a0e71 100644
--- a/src/assistant/tools/qhelpconverter/conversionwizard.cpp
+++ b/src/assistant/qhelpconverter/conversionwizard.cpp
diff --git a/src/assistant/tools/qhelpconverter/conversionwizard.h b/src/assistant/qhelpconverter/conversionwizard.h
index ff66d271e..ff66d271e 100644
--- a/src/assistant/tools/qhelpconverter/conversionwizard.h
+++ b/src/assistant/qhelpconverter/conversionwizard.h
diff --git a/src/assistant/tools/qhelpconverter/doc/filespage.html b/src/assistant/qhelpconverter/doc/filespage.html
index a7aac18da..a7aac18da 100644
--- a/src/assistant/tools/qhelpconverter/doc/filespage.html
+++ b/src/assistant/qhelpconverter/doc/filespage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/filterpage.html b/src/assistant/qhelpconverter/doc/filterpage.html
index 7b3781bd5..7b3781bd5 100644
--- a/src/assistant/tools/qhelpconverter/doc/filterpage.html
+++ b/src/assistant/qhelpconverter/doc/filterpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/generalpage.html b/src/assistant/qhelpconverter/doc/generalpage.html
index 8d106bec1..8d106bec1 100644
--- a/src/assistant/tools/qhelpconverter/doc/generalpage.html
+++ b/src/assistant/qhelpconverter/doc/generalpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/identifierpage.html b/src/assistant/qhelpconverter/doc/identifierpage.html
index 952b88de8..952b88de8 100644
--- a/src/assistant/tools/qhelpconverter/doc/identifierpage.html
+++ b/src/assistant/qhelpconverter/doc/identifierpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/inputpage.html b/src/assistant/qhelpconverter/doc/inputpage.html
index 4054c5472..4054c5472 100644
--- a/src/assistant/tools/qhelpconverter/doc/inputpage.html
+++ b/src/assistant/qhelpconverter/doc/inputpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/outputpage.html b/src/assistant/qhelpconverter/doc/outputpage.html
index 332ef69fc..332ef69fc 100644
--- a/src/assistant/tools/qhelpconverter/doc/outputpage.html
+++ b/src/assistant/qhelpconverter/doc/outputpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/pathpage.html b/src/assistant/qhelpconverter/doc/pathpage.html
index 95449b3c3..95449b3c3 100644
--- a/src/assistant/tools/qhelpconverter/doc/pathpage.html
+++ b/src/assistant/qhelpconverter/doc/pathpage.html
diff --git a/src/assistant/tools/qhelpconverter/filespage.cpp b/src/assistant/qhelpconverter/filespage.cpp
index e30ec42ef..e30ec42ef 100644
--- a/src/assistant/tools/qhelpconverter/filespage.cpp
+++ b/src/assistant/qhelpconverter/filespage.cpp
diff --git a/src/assistant/tools/qhelpconverter/filespage.h b/src/assistant/qhelpconverter/filespage.h
index 07022e898..07022e898 100644
--- a/src/assistant/tools/qhelpconverter/filespage.h
+++ b/src/assistant/qhelpconverter/filespage.h
diff --git a/src/assistant/tools/qhelpconverter/filespage.ui b/src/assistant/qhelpconverter/filespage.ui
index d308b9664..d308b9664 100644
--- a/src/assistant/tools/qhelpconverter/filespage.ui
+++ b/src/assistant/qhelpconverter/filespage.ui
diff --git a/src/assistant/tools/qhelpconverter/filterpage.cpp b/src/assistant/qhelpconverter/filterpage.cpp
index efe32c79e..efe32c79e 100644
--- a/src/assistant/tools/qhelpconverter/filterpage.cpp
+++ b/src/assistant/qhelpconverter/filterpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/filterpage.h b/src/assistant/qhelpconverter/filterpage.h
index 336c650de..336c650de 100644
--- a/src/assistant/tools/qhelpconverter/filterpage.h
+++ b/src/assistant/qhelpconverter/filterpage.h
diff --git a/src/assistant/tools/qhelpconverter/filterpage.ui b/src/assistant/qhelpconverter/filterpage.ui
index 7cda3d9be..7cda3d9be 100644
--- a/src/assistant/tools/qhelpconverter/filterpage.ui
+++ b/src/assistant/qhelpconverter/filterpage.ui
diff --git a/src/assistant/tools/qhelpconverter/finishpage.cpp b/src/assistant/qhelpconverter/finishpage.cpp
index cdbd634e6..cdbd634e6 100644
--- a/src/assistant/tools/qhelpconverter/finishpage.cpp
+++ b/src/assistant/qhelpconverter/finishpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/finishpage.h b/src/assistant/qhelpconverter/finishpage.h
index 41dec54ca..41dec54ca 100644
--- a/src/assistant/tools/qhelpconverter/finishpage.h
+++ b/src/assistant/qhelpconverter/finishpage.h
diff --git a/src/assistant/tools/qhelpconverter/generalpage.cpp b/src/assistant/qhelpconverter/generalpage.cpp
index ad0171270..ad0171270 100644
--- a/src/assistant/tools/qhelpconverter/generalpage.cpp
+++ b/src/assistant/qhelpconverter/generalpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/generalpage.h b/src/assistant/qhelpconverter/generalpage.h
index c9a8b2452..c9a8b2452 100644
--- a/src/assistant/tools/qhelpconverter/generalpage.h
+++ b/src/assistant/qhelpconverter/generalpage.h
diff --git a/src/assistant/tools/qhelpconverter/generalpage.ui b/src/assistant/qhelpconverter/generalpage.ui
index 9c2babb0a..9c2babb0a 100644
--- a/src/assistant/tools/qhelpconverter/generalpage.ui
+++ b/src/assistant/qhelpconverter/generalpage.ui
diff --git a/src/assistant/tools/qhelpconverter/helpwindow.cpp b/src/assistant/qhelpconverter/helpwindow.cpp
index 5212092f7..5212092f7 100644
--- a/src/assistant/tools/qhelpconverter/helpwindow.cpp
+++ b/src/assistant/qhelpconverter/helpwindow.cpp
diff --git a/src/assistant/tools/qhelpconverter/helpwindow.h b/src/assistant/qhelpconverter/helpwindow.h
index 9a45f06e0..9a45f06e0 100644
--- a/src/assistant/tools/qhelpconverter/helpwindow.h
+++ b/src/assistant/qhelpconverter/helpwindow.h
diff --git a/src/assistant/tools/qhelpconverter/identifierpage.cpp b/src/assistant/qhelpconverter/identifierpage.cpp
index fb8310a61..fb8310a61 100644
--- a/src/assistant/tools/qhelpconverter/identifierpage.cpp
+++ b/src/assistant/qhelpconverter/identifierpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/identifierpage.h b/src/assistant/qhelpconverter/identifierpage.h
index 05de35ca9..05de35ca9 100644
--- a/src/assistant/tools/qhelpconverter/identifierpage.h
+++ b/src/assistant/qhelpconverter/identifierpage.h
diff --git a/src/assistant/tools/qhelpconverter/identifierpage.ui b/src/assistant/qhelpconverter/identifierpage.ui
index cd0df7563..cd0df7563 100644
--- a/src/assistant/tools/qhelpconverter/identifierpage.ui
+++ b/src/assistant/qhelpconverter/identifierpage.ui
diff --git a/src/assistant/tools/qhelpconverter/inputpage.cpp b/src/assistant/qhelpconverter/inputpage.cpp
index 9abbbe74b..9abbbe74b 100644
--- a/src/assistant/tools/qhelpconverter/inputpage.cpp
+++ b/src/assistant/qhelpconverter/inputpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/inputpage.h b/src/assistant/qhelpconverter/inputpage.h
index 185b7b2b2..185b7b2b2 100644
--- a/src/assistant/tools/qhelpconverter/inputpage.h
+++ b/src/assistant/qhelpconverter/inputpage.h
diff --git a/src/assistant/tools/qhelpconverter/inputpage.ui b/src/assistant/qhelpconverter/inputpage.ui
index e7cd3a0fa..e7cd3a0fa 100644
--- a/src/assistant/tools/qhelpconverter/inputpage.ui
+++ b/src/assistant/qhelpconverter/inputpage.ui
diff --git a/src/assistant/tools/qhelpconverter/main.cpp b/src/assistant/qhelpconverter/main.cpp
index 1c2d1bf12..1c2d1bf12 100644
--- a/src/assistant/tools/qhelpconverter/main.cpp
+++ b/src/assistant/qhelpconverter/main.cpp
diff --git a/src/assistant/tools/qhelpconverter/outputpage.cpp b/src/assistant/qhelpconverter/outputpage.cpp
index 434357b34..434357b34 100644
--- a/src/assistant/tools/qhelpconverter/outputpage.cpp
+++ b/src/assistant/qhelpconverter/outputpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/outputpage.h b/src/assistant/qhelpconverter/outputpage.h
index e45afae10..e45afae10 100644
--- a/src/assistant/tools/qhelpconverter/outputpage.h
+++ b/src/assistant/qhelpconverter/outputpage.h
diff --git a/src/assistant/tools/qhelpconverter/outputpage.ui b/src/assistant/qhelpconverter/outputpage.ui
index 755f81808..755f81808 100644
--- a/src/assistant/tools/qhelpconverter/outputpage.ui
+++ b/src/assistant/qhelpconverter/outputpage.ui
diff --git a/src/assistant/tools/qhelpconverter/pathpage.cpp b/src/assistant/qhelpconverter/pathpage.cpp
index a9ddf53a5..a9ddf53a5 100644
--- a/src/assistant/tools/qhelpconverter/pathpage.cpp
+++ b/src/assistant/qhelpconverter/pathpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/pathpage.h b/src/assistant/qhelpconverter/pathpage.h
index 90b24236c..90b24236c 100644
--- a/src/assistant/tools/qhelpconverter/pathpage.h
+++ b/src/assistant/qhelpconverter/pathpage.h
diff --git a/src/assistant/tools/qhelpconverter/pathpage.ui b/src/assistant/qhelpconverter/pathpage.ui
index 89083915d..89083915d 100644
--- a/src/assistant/tools/qhelpconverter/pathpage.ui
+++ b/src/assistant/qhelpconverter/pathpage.ui
diff --git a/src/assistant/tools/qhelpconverter/qhcpwriter.cpp b/src/assistant/qhelpconverter/qhcpwriter.cpp
index cdf9f0b3c..cdf9f0b3c 100644
--- a/src/assistant/tools/qhelpconverter/qhcpwriter.cpp
+++ b/src/assistant/qhelpconverter/qhcpwriter.cpp
diff --git a/src/assistant/tools/qhelpconverter/qhcpwriter.h b/src/assistant/qhelpconverter/qhcpwriter.h
index de0c6f8e1..933d15a15 100644
--- a/src/assistant/tools/qhelpconverter/qhcpwriter.h
+++ b/src/assistant/qhelpconverter/qhcpwriter.h
@@ -42,7 +42,7 @@
 #ifndef QHCPWRITER_H
 #define QHCPWRITER_H
 
-#include <QtXml/QXmlStreamWriter>
+#include <QtCore/QXmlStreamWriter>
 #include "adpreader.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/assistant/tools/qhelpconverter/qhelpconverter.pro b/src/assistant/qhelpconverter/qhelpconverter.pro
index f8754767d..712b16f61 100644
--- a/src/assistant/tools/qhelpconverter/qhelpconverter.pro
+++ b/src/assistant/qhelpconverter/qhelpconverter.pro
@@ -1,4 +1,4 @@
-QT += xml help
+QT += help
 TEMPLATE = app
 TARGET = qhelpconverter
 DESTDIR = $$QT.designer.bins
diff --git a/src/assistant/tools/qhelpconverter/qhelpconverter.qrc b/src/assistant/qhelpconverter/qhelpconverter.qrc
index e2a68ab43..e2a68ab43 100644
--- a/src/assistant/tools/qhelpconverter/qhelpconverter.qrc
+++ b/src/assistant/qhelpconverter/qhelpconverter.qrc
diff --git a/src/assistant/tools/qhelpconverter/qhpwriter.cpp b/src/assistant/qhelpconverter/qhpwriter.cpp
index 51d392d32..51d392d32 100644
--- a/src/assistant/tools/qhelpconverter/qhpwriter.cpp
+++ b/src/assistant/qhelpconverter/qhpwriter.cpp
diff --git a/src/assistant/tools/qhelpconverter/qhpwriter.h b/src/assistant/qhelpconverter/qhpwriter.h
index 70fd04aca..c118d4c9f 100644
--- a/src/assistant/tools/qhelpconverter/qhpwriter.h
+++ b/src/assistant/qhelpconverter/qhpwriter.h
@@ -42,7 +42,7 @@
 #ifndef QHPWRITER_H
 #define QHPWRITER_H
 
-#include <QtXml/QXmlStreamWriter>
+#include <QtCore/QXmlStreamWriter>
 #include "filterpage.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/assistant/tools/qhelpgenerator/main.cpp b/src/assistant/qhelpgenerator/main.cpp
index 386e84c41..386e84c41 100644
--- a/src/assistant/tools/qhelpgenerator/main.cpp
+++ b/src/assistant/qhelpgenerator/main.cpp
diff --git a/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro
index f6db4fa11..f6db4fa11 100644
--- a/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
diff --git a/src/assistant/tools/shared/collectionconfiguration.cpp b/src/assistant/shared/collectionconfiguration.cpp
index 35d5b66df..35d5b66df 100644
--- a/src/assistant/tools/shared/collectionconfiguration.cpp
+++ b/src/assistant/shared/collectionconfiguration.cpp
diff --git a/src/assistant/tools/shared/collectionconfiguration.h b/src/assistant/shared/collectionconfiguration.h
index 226460ef3..226460ef3 100644
--- a/src/assistant/tools/shared/collectionconfiguration.h
+++ b/src/assistant/shared/collectionconfiguration.h
diff --git a/src/assistant/tools/shared/helpgenerator.cpp b/src/assistant/shared/helpgenerator.cpp
index d551548fb..d551548fb 100644
--- a/src/assistant/tools/shared/helpgenerator.cpp
+++ b/src/assistant/shared/helpgenerator.cpp
diff --git a/src/assistant/tools/shared/helpgenerator.h b/src/assistant/shared/helpgenerator.h
index e220a2b68..e220a2b68 100644
--- a/src/assistant/tools/shared/helpgenerator.h
+++ b/src/assistant/shared/helpgenerator.h
diff --git a/src/assistant/tools/tools.pro b/src/assistant/tools/tools.pro
deleted file mode 100644
index 8bb8cd700..000000000
--- a/src/assistant/tools/tools.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-CONFIG  += ordered
-
-SUBDIRS += assistant \
-           qhelpgenerator \
-           qcollectiongenerator \
-           qhelpconverter
-
diff --git a/src/designer/src/lib/extension/default_extensionfactory.cpp b/src/designer/src/lib/extension/default_extensionfactory.cpp
index a90886695..3d143b2cd 100644
--- a/src/designer/src/lib/extension/default_extensionfactory.cpp
+++ b/src/designer/src/lib/extension/default_extensionfactory.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtDesigner/default_extensionfactory.h>
+#include "default_extensionfactory.h"
 #include "qextensionmanager.h"
 #include <qpointer.h>
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h
index 370e69aae..f2ef78ee1 100644
--- a/src/designer/src/lib/extension/default_extensionfactory.h
+++ b/src/designer/src/lib/extension/default_extensionfactory.h
@@ -42,7 +42,7 @@
 #ifndef DEFAULT_EXTENSIONFACTORY_H
 #define DEFAULT_EXTENSIONFACTORY_H
 
-#include <QtDesigner/extension_global.h>
+#include "extension_global.h"
 #include <QtDesigner/extension.h>
 
 #include <QtCore/QMap>
diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h
index a387924e6..e80cddaf9 100644
--- a/src/designer/src/lib/extension/qextensionmanager.h
+++ b/src/designer/src/lib/extension/qextensionmanager.h
@@ -42,7 +42,7 @@
 #ifndef QEXTENSIONMANAGER_H
 #define QEXTENSIONMANAGER_H
 
-#include <QtDesigner/extension_global.h>
+#include "extension_global.h"
 #include <QtDesigner/extension.h>
 #include <QtCore/QHash>
 
diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index 55522d42b..a23e16417 100644
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -1,33 +1,30 @@
 load(qt_module)
 
-TEMPLATE=lib
-TARGET=QtDesigner
-QT += core-private gui-private widgets widgets-private xml uilib-private
+TARGET = QtDesigner
+QT += core-private gui-private widgets widgets-private xml uilib uilib-private
+
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-CONFIG += qt
-win32|mac: CONFIG += debug_and_release
-DESTDIR = $$QT_BUILD_TREE/lib
-!wince*:DLLDESTDIR = $$QT.designer.bins
 
-INCLUDEPATH += $$QT.designer.includes \
-               $$QT.designer.private_includes \
-               $$QT.designer.private_includes/QtDesigner
+#win32|mac: CONFIG += debug_and_release
+#DESTDIR = $$QT_BUILD_TREE/lib
+#!wince*:DLLDESTDIR = $$QT.designer.bins
 
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.3.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
+#INCLUDEPATH += $$QT.designer.includes \
+#               $$QT.designer.private_includes \
+#               $$QT.designer.private_includes/QtDesigner
+
+#isEmpty(QT_MAJOR_VERSION) {
+#   VERSION=4.3.0
+#} else {
+#   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+#}
 
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml
 
-include($$QT_SOURCE_TREE/src/qt_targets.pri)
+load(qt_module_config)
 
 HEADERS += qtdesignerversion.h
 
-QMAKE_TARGET_PRODUCT = Designer
-QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
-
 !contains(CONFIG, static) {
     CONFIG += dll
 
@@ -40,13 +37,11 @@ QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
     DEFINES += QT_DESIGNER_STATIC
 }
 
-#load up the headers info
-CONFIG += qt_install_headers
-#headers.pri is loaded from the last include path
-LAST_MODULE_INCLUDE=$$INCLUDEPATH
-for(include_path, INCLUDEPATH):LAST_MODULE_INCLUDE=$${include_path}
-HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri
-include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
+##headers.pri is loaded from the last include path
+#LAST_MODULE_INCLUDE=$$INCLUDEPATH
+#for(include_path, INCLUDEPATH):LAST_MODULE_INCLUDE=$${include_path}
+#HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri
+#include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
 
 #mac frameworks
 mac:CONFIG += explicitlib
@@ -68,24 +63,22 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
 
 include(extension/extension.pri)
 include(sdk/sdk.pri)
-include($$QT_SOURCE_TREE/tools/uilib/uilib.pri)
-INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib
 include(shared/shared.pri)
 PRECOMPILED_HEADER=lib_pch.h
 
 include(../sharedcomponents.pri)
 include(../components/component.pri)
 
-target.path=$$[QT_INSTALL_LIBS]
-INSTALLS        += target
-win32 {
-    dlltarget.path=$$[QT_INSTALL_BINS]
-    INSTALLS += dlltarget
-}
+#target.path=$$[QT_INSTALL_LIBS]
+#INSTALLS        += target
+#win32 {
+#    dlltarget.path=$$[QT_INSTALL_BINS]
+#    INSTALLS += dlltarget
+#}
 
 
-qt_install_headers {
-    designer_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
-    designer_headers.path = $$[QT_INSTALL_HEADERS]/QtDesigner
-    INSTALLS        += designer_headers
-}
+#qt_install_headers {
+#    designer_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
+#    designer_headers.path = $$[QT_INSTALL_HEADERS]/QtDesigner
+#    INSTALLS        += designer_headers
+#}
diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
index 8c63ac990..5b9f1d11b 100644
--- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
+++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
@@ -45,7 +45,7 @@
 #include "widgetfactory_p.h"
 #include "qdesigner_introspection_p.h"
 
-#include <ui4_p.h>
+#include <private/ui4_p.h>
 #include <formbuilderextra_p.h>
 // sdk
 #include <QtDesigner/container.h>
diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
index 771306e9f..7a846c52b 100644
--- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -46,7 +46,7 @@
 #include "qlayout_widget_p.h"
 #include "qdesigner_introspection_p.h"
 
-#include <formbuilderextra_p.h>
+#include <private/formbuilderextra_p.h>
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 #include <QtDesigner/QDesignerFormEditorInterface>
diff --git a/src/designer/src/lib/shared/shared.pri b/src/designer/src/lib/shared/shared.pri
index 9cba7d7bf..d46d170f0 100644
--- a/src/designer/src/lib/shared/shared.pri
+++ b/src/designer/src/lib/shared/shared.pri
@@ -4,7 +4,7 @@ contains(QT_CONFIG, script): QT += script
 
 include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
 include(../../../../shared/deviceskin/deviceskin.pri)
-include($$QT_SOURCE_TREE/src/tools/rcc/rcc.pri)
+include($$QT_MODULE_BASE/src/tools/rcc/rcc.pri)
 include(../../../../shared/findwidget/findwidget.pri)
 include(../../../../shared/qtgradienteditor/qtgradienteditor.pri)
 
diff --git a/src/shared/qtgradienteditor/qtcolorline.cpp b/src/shared/qtgradienteditor/qtcolorline.cpp
index 2f241f82d..22039b398 100644
--- a/src/shared/qtgradienteditor/qtcolorline.cpp
+++ b/src/shared/qtgradienteditor/qtcolorline.cpp
@@ -682,11 +682,12 @@ void QtColorLinePrivate::paintEvent(QPaintEvent *)
             pmp.end();
 
             p.setBrushOrigin((rect.width() % pixSize + pixSize) / 2, (rect.height() % pixSize + pixSize) / 2);
-            p.setClipRect(r[1].adjusted(4, 4, -4, -4));
-            p.setClipRect(QRect(rect.topLeft(), QPoint(r[1].left() + 0, rect.bottom())), Qt::UniteClip);
-            p.setClipRect(QRect(QPoint(r[1].right() - 0, rect.top()), rect.bottomRight()), Qt::UniteClip);
-            p.setClipRect(QRect(rect.topLeft(), QPoint(rect.right(), r[1].top() + 0)), Qt::UniteClip);
-            p.setClipRect(QRect(QPoint(rect.left(), r[1].bottom() - 0), rect.bottomRight()), Qt::UniteClip);
+            QRegion region = r[1].adjusted(4, 4, -4, -4);
+            region |= QRect(rect.topLeft(), QPoint(r[1].left() + 0, rect.bottom()));
+            region |= QRect(QPoint(r[1].right() - 0, rect.top()), rect.bottomRight());
+            region |= QRect(rect.topLeft(), QPoint(rect.right(), r[1].top() + 0));
+            region |= QRect(QPoint(rect.left(), r[1].bottom() - 0), rect.bottomRight());
+            p.setClipRegion(region);
             /*
             p.setClipRect(r[1].adjusted(3, 3, -3, -3));
             p.setClipRect(QRect(rect.topLeft(), QPoint(r[1].left() + 1, rect.bottom())), Qt::UniteClip);
@@ -842,11 +843,13 @@ void QtColorLinePrivate::paintEvent(QPaintEvent *)
             }
             p.setBrush(m_alphalessPixmap);
             if (m_orientation == Qt::Horizontal) {
-                p.setClipRect(r[1].adjusted(0, qRound(r[1].height() * coef), 0, 0));
-                p.setClipRect(r[1].adjusted(0, 0, 0, -qRound(r[1].height() * coef)), Qt::UniteClip);
+                QRegion region = r[1].adjusted(0, qRound(r[1].height() * coef), 0, 0);
+                region |= r[1].adjusted(0, 0, 0, -qRound(r[1].height() * coef));
+                p.setClipRegion(region);
             } else {
-                p.setClipRect(r[1].adjusted(qRound(r[1].width() * coef), 0, 0, 0));
-                p.setClipRect(r[1].adjusted(0, 0, -qRound(r[1].width() * coef), 0), Qt::UniteClip);
+                QRegion region = r[1].adjusted(qRound(r[1].width() * coef), 0, 0, 0);
+                region |= r[1].adjusted(0, 0, -qRound(r[1].width() * coef), 0);
+                p.setClipRegion(region);
             }
             p.setBrush(Qt::NoBrush);
             p.setPen(QPen(QColor(c.rgb())));
diff --git a/src/shared/qtgradienteditor/qtgradientwidget.cpp b/src/shared/qtgradienteditor/qtgradientwidget.cpp
index bf9ea0da6..c32f23841 100644
--- a/src/shared/qtgradienteditor/qtgradientwidget.cpp
+++ b/src/shared/qtgradienteditor/qtgradientwidget.cpp
@@ -592,9 +592,10 @@ void QtGradientWidget::paintEvent(QPaintEvent *e)
                         central.y() - d_ptr->m_radiusRadial * size().height(),
                         2 * d_ptr->m_radiusRadial * size().width(),
                         2 * d_ptr->m_radiusRadial * size().height());
-        p.setClipRect(r1);
-        p.setClipRect(r2, Qt::UniteClip);
-        p.setClipRect(r3, Qt::UniteClip);
+        QRegion region = r1.toRect();
+        region |= r2.toRect();
+        region |= r3.toRect();
+        p.setClipRegion(region);
         p.drawEllipse(rect);
         if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::RadiusRadialHandle) {
             p.save();
diff --git a/sync.profile b/sync.profile
index f89300826..e748d5ecc 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,6 +1,6 @@
 %modules = ( # path to module name map
-    "QtCLucene" => "$basedir/src/assistant/lib/fulltextsearch",
-    "QtHelp" => "$basedir/src/assistant/lib",
+    "QtCLucene" => "$basedir/src/assistant/clucene",
+    "QtHelp" => "$basedir/src/assistant/help",
     "QtDesigner" => "$basedir/src/designer/src/lib",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
@@ -15,7 +15,6 @@
     "xml" => "#include <QtXml/QtXml>\n",
     "network" => "#include <QtNetwork/QtNetwork>\n",
     "script" => "#include <QtScript/QtScript>\n",
-    "qt3support" => "#include <Qt3Support/Qt3Support>\n",
     "declarative" => "#include <QtDeclarative/QtDeclarative>\n",
     "clucene" => "#include <QtCLucene/QtCLucene>\n",
     "help" => "#include <QtHelp/QtHelp>\n",
@@ -27,47 +26,8 @@
     "QtHelp" => "$basedir/modules/qt_help.pri",
     "QtDesigner" => "$basedir/modules/qt_designer.pri",
 );
-# Modules and programs, and their dependencies.
-# Each of the module version specifiers can take one of the following values:
-#   - A specific Git revision.
-#   - "LATEST_REVISION", to always test against the latest revision.
-#   - "LATEST_RELEASE", to always test against the latest public release.
-#   - "THIS_REPOSITORY", to indicate that the module is in this repository.
 %dependencies = (
-    "QtHelp" => {
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtSql" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
-    "linguist" => {
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtDesigner" => "THIS_REPOSITORY",
-        "QtUiTools" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
-    "designer" => {
-        "QtNetwork" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtDesigner" => "THIS_REPOSITORY",
-        "QtScript" => "4d15ca64fc7ca81bdadba9fbeb84d4e98a6c0edc",
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
-    "assistant" => {
-        "QtWebKit" => "LATEST_REVISION",
-        "QtHelp" => "THIS_REPOSITORY",
-        "QtNetwork" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtSql" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
-    "QtDesigner" => {
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtScript" => "4d15ca64fc7ca81bdadba9fbeb84d4e98a6c0edc",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
+    	"qtbase" => "refs/heads/master",
+        "qtsvg" => "refs/heads/master",
+        "qtxmlpatterns" => "refs/heads/master",
 );