summaryrefslogtreecommitdiff
path: root/src/assistant
diff options
context:
space:
mode:
Diffstat (limited to 'src/assistant')
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/CLMonolithic.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/StdHeader.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/StdHeader.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/config/CompilerAcc.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/SegmentHeader.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/Term.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/Term.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/TermVector.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/store/Directory.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/store/Lock.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/util/Equators.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/util/Equators.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/util/Misc.cpp2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/util/Misc.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.h2
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/util/streambase.h2
-rw-r--r--src/assistant/assistant/Info_mac.plist2
-rw-r--r--src/assistant/assistant/aboutdialog.cpp2
-rw-r--r--src/assistant/assistant/aboutdialog.h2
-rw-r--r--src/assistant/assistant/assistant.pro8
-rw-r--r--src/assistant/assistant/assistant.rc2
-rw-r--r--src/assistant/assistant/bookmarkdialog.cpp2
-rw-r--r--src/assistant/assistant/bookmarkdialog.h2
-rw-r--r--src/assistant/assistant/bookmarkfiltermodel.cpp2
-rw-r--r--src/assistant/assistant/bookmarkfiltermodel.h2
-rw-r--r--src/assistant/assistant/bookmarkitem.cpp2
-rw-r--r--src/assistant/assistant/bookmarkitem.h2
-rw-r--r--src/assistant/assistant/bookmarkmanager.cpp2
-rw-r--r--src/assistant/assistant/bookmarkmanager.h2
-rw-r--r--src/assistant/assistant/bookmarkmanagerwidget.cpp2
-rw-r--r--src/assistant/assistant/bookmarkmanagerwidget.h2
-rw-r--r--src/assistant/assistant/bookmarkmodel.cpp2
-rw-r--r--src/assistant/assistant/bookmarkmodel.h2
-rw-r--r--src/assistant/assistant/centralwidget.cpp17
-rw-r--r--src/assistant/assistant/centralwidget.h4
-rw-r--r--src/assistant/assistant/cmdlineparser.cpp2
-rw-r--r--src/assistant/assistant/cmdlineparser.h2
-rw-r--r--src/assistant/assistant/contentwindow.cpp2
-rw-r--r--src/assistant/assistant/contentwindow.h2
-rw-r--r--src/assistant/assistant/doc/qtassistant.qdocconf40
-rw-r--r--src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc2
-rw-r--r--src/assistant/assistant/doc/snippets/simpletextviewer/assistant.cpp2
-rw-r--r--src/assistant/assistant/doc/snippets/simpletextviewer/findfiledialog.cpp2
-rw-r--r--src/assistant/assistant/doc/snippets/simpletextviewer/mainwindow.cpp2
-rw-r--r--src/assistant/assistant/doc/src/assistant-example.qdoc51
-rw-r--r--src/assistant/assistant/doc/src/assistant-manual.qdoc2
-rw-r--r--src/assistant/assistant/filternamedialog.cpp2
-rw-r--r--src/assistant/assistant/filternamedialog.h2
-rw-r--r--src/assistant/assistant/findwidget.cpp2
-rw-r--r--src/assistant/assistant/findwidget.h2
-rw-r--r--src/assistant/assistant/globalactions.cpp2
-rw-r--r--src/assistant/assistant/globalactions.h2
-rw-r--r--src/assistant/assistant/helpenginewrapper.cpp21
-rw-r--r--src/assistant/assistant/helpenginewrapper.h6
-rw-r--r--src/assistant/assistant/helpviewer.cpp29
-rw-r--r--src/assistant/assistant/helpviewer.h3
-rw-r--r--src/assistant/assistant/helpviewer_p.h2
-rw-r--r--src/assistant/assistant/helpviewer_qtb.cpp20
-rw-r--r--src/assistant/assistant/helpviewer_qwv.cpp51
-rw-r--r--src/assistant/assistant/indexwindow.cpp2
-rw-r--r--src/assistant/assistant/indexwindow.h2
-rw-r--r--src/assistant/assistant/installdialog.cpp2
-rw-r--r--src/assistant/assistant/installdialog.h2
-rw-r--r--src/assistant/assistant/main.cpp2
-rw-r--r--src/assistant/assistant/mainwindow.cpp36
-rw-r--r--src/assistant/assistant/mainwindow.h2
-rw-r--r--src/assistant/assistant/openpagesmanager.cpp2
-rw-r--r--src/assistant/assistant/openpagesmanager.h2
-rw-r--r--src/assistant/assistant/openpagesmodel.cpp2
-rw-r--r--src/assistant/assistant/openpagesmodel.h2
-rw-r--r--src/assistant/assistant/openpagesswitcher.cpp2
-rw-r--r--src/assistant/assistant/openpagesswitcher.h2
-rw-r--r--src/assistant/assistant/openpageswidget.cpp2
-rw-r--r--src/assistant/assistant/openpageswidget.h2
-rw-r--r--src/assistant/assistant/preferencesdialog.cpp2
-rw-r--r--src/assistant/assistant/preferencesdialog.h2
-rw-r--r--src/assistant/assistant/qtdocinstaller.cpp2
-rw-r--r--src/assistant/assistant/qtdocinstaller.h2
-rw-r--r--src/assistant/assistant/remotecontrol.cpp2
-rw-r--r--src/assistant/assistant/remotecontrol.h2
-rw-r--r--src/assistant/assistant/remotecontrol_win.h2
-rw-r--r--src/assistant/assistant/searchwidget.cpp2
-rw-r--r--src/assistant/assistant/searchwidget.h2
-rw-r--r--src/assistant/assistant/topicchooser.cpp112
-rw-r--r--src/assistant/assistant/topicchooser.h28
-rw-r--r--src/assistant/assistant/topicchooser.ui19
-rw-r--r--src/assistant/assistant/tracer.h2
-rw-r--r--src/assistant/assistant/xbelsupport.cpp2
-rw-r--r--src/assistant/assistant/xbelsupport.h2
-rw-r--r--src/assistant/clucene/clucene.pro2
-rw-r--r--src/assistant/clucene/qanalyzer.cpp2
-rw-r--r--src/assistant/clucene/qanalyzer_p.h2
-rw-r--r--src/assistant/clucene/qclucene-config_p.h2
-rw-r--r--src/assistant/clucene/qclucene_global_p.h9
-rw-r--r--src/assistant/clucene/qdocument.cpp2
-rw-r--r--src/assistant/clucene/qdocument_p.h2
-rw-r--r--src/assistant/clucene/qfield.cpp2
-rw-r--r--src/assistant/clucene/qfield_p.h2
-rw-r--r--src/assistant/clucene/qfilter.cpp2
-rw-r--r--src/assistant/clucene/qfilter_p.h2
-rw-r--r--src/assistant/clucene/qhits.cpp2
-rw-r--r--src/assistant/clucene/qhits_p.h2
-rw-r--r--src/assistant/clucene/qindexreader.cpp2
-rw-r--r--src/assistant/clucene/qindexreader_p.h2
-rw-r--r--src/assistant/clucene/qindexwriter.cpp2
-rw-r--r--src/assistant/clucene/qindexwriter_p.h2
-rw-r--r--src/assistant/clucene/qquery.cpp2
-rw-r--r--src/assistant/clucene/qquery_p.h2
-rw-r--r--src/assistant/clucene/qqueryparser.cpp2
-rw-r--r--src/assistant/clucene/qqueryparser_p.h2
-rw-r--r--src/assistant/clucene/qreader.cpp2
-rw-r--r--src/assistant/clucene/qreader_p.h2
-rw-r--r--src/assistant/clucene/qsearchable.cpp2
-rw-r--r--src/assistant/clucene/qsearchable_p.h2
-rw-r--r--src/assistant/clucene/qsort.cpp2
-rw-r--r--src/assistant/clucene/qsort_p.h2
-rw-r--r--src/assistant/clucene/qterm.cpp2
-rw-r--r--src/assistant/clucene/qterm_p.h2
-rw-r--r--src/assistant/clucene/qtoken.cpp2
-rw-r--r--src/assistant/clucene/qtoken_p.h2
-rw-r--r--src/assistant/clucene/qtokenizer.cpp2
-rw-r--r--src/assistant/clucene/qtokenizer_p.h2
-rw-r--r--src/assistant/clucene/qtokenstream.cpp2
-rw-r--r--src/assistant/clucene/qtokenstream_p.h2
-rw-r--r--src/assistant/help/doc/qthelp.qdocconf38
-rw-r--r--src/assistant/help/doc/snippets/doc_src_qthelp.cpp63
-rw-r--r--src/assistant/help/doc/snippets/doc_src_qthelp.qdoc175
-rw-r--r--src/assistant/help/doc/src/qthelp-examples.qdoc47
-rw-r--r--src/assistant/help/doc/src/qthelp-index.qdoc93
-rw-r--r--src/assistant/help/doc/src/qthelp-module.qdoc50
-rw-r--r--src/assistant/help/doc/src/qthelp.qdoc363
-rw-r--r--src/assistant/help/help.pro16
-rw-r--r--src/assistant/help/qclucenefieldnames.cpp2
-rw-r--r--src/assistant/help/qclucenefieldnames_p.h2
-rw-r--r--src/assistant/help/qhelp_global.cpp2
-rw-r--r--src/assistant/help/qhelp_global.h2
-rw-r--r--src/assistant/help/qhelpcollectionhandler.cpp2
-rw-r--r--src/assistant/help/qhelpcollectionhandler_p.h2
-rw-r--r--src/assistant/help/qhelpcontentwidget.cpp25
-rw-r--r--src/assistant/help/qhelpcontentwidget.h2
-rw-r--r--src/assistant/help/qhelpdatainterface.cpp2
-rw-r--r--src/assistant/help/qhelpdatainterface_p.h2
-rw-r--r--src/assistant/help/qhelpdbreader.cpp2
-rw-r--r--src/assistant/help/qhelpdbreader_p.h2
-rw-r--r--src/assistant/help/qhelpengine.cpp2
-rw-r--r--src/assistant/help/qhelpengine.h2
-rw-r--r--src/assistant/help/qhelpengine_p.h3
-rw-r--r--src/assistant/help/qhelpenginecore.cpp4
-rw-r--r--src/assistant/help/qhelpenginecore.h2
-rw-r--r--src/assistant/help/qhelpgenerator.cpp2
-rw-r--r--src/assistant/help/qhelpgenerator_p.h2
-rw-r--r--src/assistant/help/qhelpindexwidget.cpp2
-rw-r--r--src/assistant/help/qhelpindexwidget.h2
-rw-r--r--src/assistant/help/qhelpprojectdata.cpp2
-rw-r--r--src/assistant/help/qhelpprojectdata_p.h2
-rw-r--r--src/assistant/help/qhelpsearchengine.cpp2
-rw-r--r--src/assistant/help/qhelpsearchengine.h6
-rw-r--r--src/assistant/help/qhelpsearchindex_default.cpp2
-rw-r--r--src/assistant/help/qhelpsearchindex_default_p.h2
-rw-r--r--src/assistant/help/qhelpsearchindexreader.cpp2
-rw-r--r--src/assistant/help/qhelpsearchindexreader_clucene.cpp9
-rw-r--r--src/assistant/help/qhelpsearchindexreader_clucene_p.h2
-rw-r--r--src/assistant/help/qhelpsearchindexreader_default.cpp2
-rw-r--r--src/assistant/help/qhelpsearchindexreader_default_p.h2
-rw-r--r--src/assistant/help/qhelpsearchindexreader_p.h2
-rw-r--r--src/assistant/help/qhelpsearchindexwriter_clucene.cpp20
-rw-r--r--src/assistant/help/qhelpsearchindexwriter_clucene_p.h2
-rw-r--r--src/assistant/help/qhelpsearchindexwriter_default.cpp2
-rw-r--r--src/assistant/help/qhelpsearchindexwriter_default_p.h2
-rw-r--r--src/assistant/help/qhelpsearchquerywidget.cpp42
-rw-r--r--src/assistant/help/qhelpsearchquerywidget.h2
-rw-r--r--src/assistant/help/qhelpsearchresultwidget.cpp2
-rw-r--r--src/assistant/help/qhelpsearchresultwidget.h2
-rw-r--r--src/assistant/qcollectiongenerator/main.cpp2
-rw-r--r--src/assistant/qhelpconverter/adpreader.cpp2
-rw-r--r--src/assistant/qhelpconverter/adpreader.h2
-rw-r--r--src/assistant/qhelpconverter/conversionwizard.cpp2
-rw-r--r--src/assistant/qhelpconverter/conversionwizard.h2
-rw-r--r--src/assistant/qhelpconverter/filespage.cpp2
-rw-r--r--src/assistant/qhelpconverter/filespage.h2
-rw-r--r--src/assistant/qhelpconverter/filterpage.cpp2
-rw-r--r--src/assistant/qhelpconverter/filterpage.h2
-rw-r--r--src/assistant/qhelpconverter/finishpage.cpp2
-rw-r--r--src/assistant/qhelpconverter/finishpage.h2
-rw-r--r--src/assistant/qhelpconverter/generalpage.cpp2
-rw-r--r--src/assistant/qhelpconverter/generalpage.h2
-rw-r--r--src/assistant/qhelpconverter/helpwindow.cpp2
-rw-r--r--src/assistant/qhelpconverter/helpwindow.h2
-rw-r--r--src/assistant/qhelpconverter/identifierpage.cpp2
-rw-r--r--src/assistant/qhelpconverter/identifierpage.h2
-rw-r--r--src/assistant/qhelpconverter/inputpage.cpp2
-rw-r--r--src/assistant/qhelpconverter/inputpage.h2
-rw-r--r--src/assistant/qhelpconverter/main.cpp2
-rw-r--r--src/assistant/qhelpconverter/outputpage.cpp2
-rw-r--r--src/assistant/qhelpconverter/outputpage.h2
-rw-r--r--src/assistant/qhelpconverter/pathpage.cpp2
-rw-r--r--src/assistant/qhelpconverter/pathpage.h2
-rw-r--r--src/assistant/qhelpconverter/qhcpwriter.cpp2
-rw-r--r--src/assistant/qhelpconverter/qhcpwriter.h2
-rw-r--r--src/assistant/qhelpconverter/qhelpconverter.pro1
-rw-r--r--src/assistant/qhelpconverter/qhpwriter.cpp2
-rw-r--r--src/assistant/qhelpconverter/qhpwriter.h2
-rw-r--r--src/assistant/qhelpgenerator/main.cpp2
-rw-r--r--src/assistant/qhelpgenerator/qhelpgenerator.pro2
-rw-r--r--src/assistant/shared/collectionconfiguration.cpp2
-rw-r--r--src/assistant/shared/collectionconfiguration.h2
-rw-r--r--src/assistant/shared/helpgenerator.cpp2
-rw-r--r--src/assistant/shared/helpgenerator.h2
257 files changed, 1438 insertions, 421 deletions
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/CLMonolithic.cpp b/src/assistant/3rdparty/clucene/src/CLucene/CLMonolithic.cpp
index e3c279876..b741b9d19 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/CLMonolithic.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/CLMonolithic.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
/*
* this is a monolithic file that can be used to compile clucene using one source file.
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.cpp
index d64c51f77..98805a615 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#include "CLucene/StdHeader.h"
#include "CLucene/util/Misc.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.h
index 224d400eb..4f0b6cc8e 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#ifndef lucene_stdheader_h
#define lucene_stdheader_h
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp
index 142bbfb63..48eb8d332 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#include "CLucene/StdHeader.h"
#include "Analyzers.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerAcc.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerAcc.h
index 6ecd142be..7bfa7237b 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerAcc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerAcc.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#if !defined(_lucene_COMPILER_ACC)
#define _lucene_COMPILER_ACC
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
index 41310cefe..e8d68c351 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#if !defined(_lucene_COMPILER_GCC)
#define _lucene_COMPILER_GCC
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h
index 0021ea368..6ec19c338 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#if !defined(_lucene_COMPILER_MSVC)
#define _lucene_COMPILER_MSVC
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
index 5463936f6..e22b20506 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
@@ -41,7 +41,7 @@
*/
/*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp
index efa0e2563..848302a55 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#include "CLucene/StdHeader.h"
#include "CompoundFile.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.h b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.h
index 84799a62f..b5d99a99d 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_compoundfile_h
#define _lucene_index_compoundfile_h
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp
index dcbc31591..9288fe63a 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.h
index 7096ba3ee..06052fc67 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_DocumentWriter_
#define _lucene_index_DocumentWriter_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp
index 0c66882f4..f63ead399 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "FieldInfos.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.h
index 7b6d0f56d..518c498d7 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_FieldInfos_
#define _lucene_index_FieldInfos_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp
index e3f9d1cc2..b9a5d3878 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "FieldsReader.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.h
index 53589a5cc..0adc5a35b 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_FieldsReader_
#define _lucene_index_FieldsReader_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp
index ceb6735cb..96f5cfdb1 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "FieldsWriter.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.h
index 7dde5f225..a7690e422 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_FieldsWriter_
#define _lucene_index_FieldsWriter_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
index 1423cc7a8..3f58efa34 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "IndexModifier.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.h b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.h
index 4e9963f5a..88217dd0d 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_IndexModifier_
#define _lucene_index_IndexModifier_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.cpp
index 91c735632..807bc6fb1 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
# include <QtCore/QFile>
# include <QtCore/QStringList>
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.h
index 352d16e80..7c2e81cb9 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_IndexReader_
#define _lucene_index_IndexReader_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
index 5504cf6fa..03ea00398 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "IndexWriter.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.h
index 80476c864..d164ed3b5 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_IndexWriter_
#define _lucene_index_IndexWriter_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentHeader.h
index 00b08991d..b1efdfd40 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentHeader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentHeader.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_SegmentHeader_
#define _lucene_index_SegmentHeader_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp
index f62c4061a..4c9e3d47b 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "SegmentInfos.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.h
index ce7183820..06ed05798 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_SegmentInfos_
#define _lucene_index_SegmentInfos_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
index 40814da0c..c46469090 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "SegmentMerger.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.h
index 230843b00..f3da361e6 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_SegmentMerger_
#define _lucene_index_SegmentMerger_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp
index ba061714b..da362aeda 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "SegmentHeader.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/Term.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.cpp
index 5ff7bb264..0d8c1c844 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/Term.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#include "CLucene/StdHeader.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/Term.h b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.h
index 68eefd194..dea4a55db 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/Term.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#ifndef _lucene_index_Term_
#define _lucene_index_Term_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.cpp
index ac1107317..185fd6680 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#include "CLucene/StdHeader.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.h
index 57b7a9a76..47f2114f1 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#ifndef _lucene_index_TermInfo
#define _lucene_index_TermInfo
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp
index 8f9e43dec..de9db6482 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "TermInfosReader.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.h
index ed202e750..b1d687fcd 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_TermInfosReader_
#define _lucene_index_TermInfosReader_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp
index c5b5340c3..5964158a5 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "TermInfosWriter.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h
index 7e3c68699..4fe728d83 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_TermInfosWriter_
#define _lucene_index_TermInfosWriter_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/TermVector.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVector.h
index 8601fbf53..300619550 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/TermVector.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVector.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_index_termvector_h
#define _lucene_index_termvector_h
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
index 53d909b29..100ced9a4 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "TermVector.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp
index 276b1bbd0..c8a62d10b 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "TermVector.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.h
index b3b55523e..d4cea6a96 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#ifndef _lucene_queryParser_Lexer_
#define _lucene_queryParser_Lexer_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp
index b57896b66..b2a9188ba 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#include "CLucene/StdHeader.h"
#include "MultiFieldQueryParser.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp
index b11eec0bb..290e7284e 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#include "CLucene/StdHeader.h"
#include "QueryParser.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
index 7b95b30f9..d2211ee7f 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#include "CLucene/StdHeader.h"
#include "QueryParserBase.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.h
index 2147bc516..73e8bdc51 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#ifndef _lucene_search_BooleanScorer_
#define _lucene_search_BooleanScorer_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp
index c948cfa4b..872e51413 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "IndexSearcher.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.h b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.h
index 307e0266d..4e0c37e1a 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_search_IndexSearcher_
#define _lucene_search_IndexSearcher_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/store/Directory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/Directory.h
index 818bc7af9..018bb1642 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/store/Directory.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/Directory.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_store_Directory
#define _lucene_store_Directory
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
index d390453ad..68d45b9e8 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include <QtCore/QDir>
#include <QtCore/QDateTime>
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.h
index e967380e0..d8cc13604 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_store_FSDirectory_
#define _lucene_store_FSDirectory_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.h b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.h
index 9453b5cf1..e9eb459b5 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_store_IndexInput_
#define _lucene_store_IndexInput_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.h b/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.h
index b5dda3b06..15e8e321a 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_store_Lock_
#define _lucene_store_Lock_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp
index b0a7c4d64..db68438a8 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "RAMDirectory.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.h
index af92e30b2..45a89969f 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_store_RAMDirectory_
#define _lucene_store_RAMDirectory_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp
index 056fa9bc3..efbb03b44 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "TransactionalRAMDirectory.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h
index 44c5e8e99..06bfab34f 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_store_TransactionalRAMDirectory_
#define _lucene_store_TransactionalRAMDirectory_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.cpp
index 3679bd120..013425314 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "BitSet.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.h b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.h
index e93847e98..a387d7814 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_util_BitSet_
#define _lucene_util_BitSet_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.cpp
index e112bd234..853b76a30 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "Equators.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.h
index 11fcb0eaf..c96f637a1 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_util_Equators_
#define _lucene_util_Equators_
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.cpp
index 42e3fd0a8..7d9c217fe 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.cpp
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#include "CLucene/StdHeader.h"
#include "Misc.h"
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.h
index 561c6e4d9..b55397321 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
- * Changes are Copyright(C) 2007, 2008 by Nokia Corporation and/or its subsidiary(-ies), all rights reserved.
+ * Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*/
#ifndef _lucene_util_Misc_H
#define _lucene_util_Misc_H
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.h b/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.h
index f67c76ca9..ce3204973 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
#ifndef _lucene_util_ThreadLocal_H
#define _lucene_util_ThreadLocal_H
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/util/streambase.h b/src/assistant/3rdparty/clucene/src/CLucene/util/streambase.h
index b0d9dc167..90f8b4036 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/util/streambase.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/util/streambase.h
@@ -4,7 +4,7 @@
* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
*
-* Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
------------------------------------------------------------------------------*/
/* This file is part of Strigi Desktop Search
*
diff --git a/src/assistant/assistant/Info_mac.plist b/src/assistant/assistant/Info_mac.plist
index 76369a1c5..48b84804e 100644
--- a/src/assistant/assistant/Info_mac.plist
+++ b/src/assistant/assistant/Info_mac.plist
@@ -11,7 +11,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleIdentifier</key>
- <string>com.trolltech.assistant</string>
+ <string>org.qt-project.assistant</string>
<key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string>
</dict>
diff --git a/src/assistant/assistant/aboutdialog.cpp b/src/assistant/assistant/aboutdialog.cpp
index 480bb7e2d..49c00b719 100644
--- a/src/assistant/assistant/aboutdialog.cpp
+++ b/src/assistant/assistant/aboutdialog.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/aboutdialog.h b/src/assistant/assistant/aboutdialog.h
index a0c722854..315d5af99 100644
--- a/src/assistant/assistant/aboutdialog.h
+++ b/src/assistant/assistant/aboutdialog.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index fb5b43ed8..168725c4c 100644
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -2,18 +2,16 @@ TEMPLATE = app
LANGUAGE = C++
TARGET = assistant
DESTDIR = $$QT.help.bins
-!isEmpty(QT.webkitwidgets.name) {
+qtHaveModule(webkitwidgets) {
QT += webkitwidgets
} else {
DEFINES += QT_NO_WEBKIT
}
!build_pass:contains(QT_CONFIG, build_all): CONFIG += release
QT += widgets network help sql help
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
PROJECTNAME = Assistant
-DEPENDPATH += ../shared
-
include(../../shared/fontpanel/fontpanel.pri)
QMAKE_DOCS = $$PWD/doc/qtassistant.qdocconf
@@ -81,7 +79,7 @@ SOURCES += aboutdialog.cpp \
openpageswidget.cpp \
openpagesmanager.cpp \
openpagesswitcher.cpp
-contains(QT_CONFIG, webkitwidgets) {
+qtHaveModule(webkitwidgets) {
SOURCES += helpviewer_qwv.cpp
} else {
SOURCES += helpviewer_qtb.cpp
diff --git a/src/assistant/assistant/assistant.rc b/src/assistant/assistant/assistant.rc
index d9a986ac0..d9b66e6de 100644
--- a/src/assistant/assistant/assistant.rc
+++ b/src/assistant/assistant/assistant.rc
@@ -18,7 +18,7 @@ BEGIN
VALUE "CompanyName", "Digia Plc and/or its subsidiary(-ies)"
VALUE "FileDescription", "Qt Assistant"
VALUE "FileVersion", "1.0.0.0"
- VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)."
+ VALUE "LegalCopyright", "Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies)."
VALUE "InternalName", "assistant.exe"
VALUE "OriginalFilename", "assistant.exe"
VALUE "ProductName", "Qt Assistant"
diff --git a/src/assistant/assistant/bookmarkdialog.cpp b/src/assistant/assistant/bookmarkdialog.cpp
index 8b9a88805..3afce9ae0 100644
--- a/src/assistant/assistant/bookmarkdialog.cpp
+++ b/src/assistant/assistant/bookmarkdialog.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkdialog.h b/src/assistant/assistant/bookmarkdialog.h
index b0d1ba2e6..5e0372636 100644
--- a/src/assistant/assistant/bookmarkdialog.h
+++ b/src/assistant/assistant/bookmarkdialog.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkfiltermodel.cpp b/src/assistant/assistant/bookmarkfiltermodel.cpp
index c4ac722be..e98c0316f 100644
--- a/src/assistant/assistant/bookmarkfiltermodel.cpp
+++ b/src/assistant/assistant/bookmarkfiltermodel.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkfiltermodel.h b/src/assistant/assistant/bookmarkfiltermodel.h
index a19a153fd..840255e40 100644
--- a/src/assistant/assistant/bookmarkfiltermodel.h
+++ b/src/assistant/assistant/bookmarkfiltermodel.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkitem.cpp b/src/assistant/assistant/bookmarkitem.cpp
index c4c76b734..98c29031f 100644
--- a/src/assistant/assistant/bookmarkitem.cpp
+++ b/src/assistant/assistant/bookmarkitem.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkitem.h b/src/assistant/assistant/bookmarkitem.h
index b141396d6..0533e4b9e 100644
--- a/src/assistant/assistant/bookmarkitem.h
+++ b/src/assistant/assistant/bookmarkitem.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkmanager.cpp b/src/assistant/assistant/bookmarkmanager.cpp
index 3f44a7063..f1b511f51 100644
--- a/src/assistant/assistant/bookmarkmanager.cpp
+++ b/src/assistant/assistant/bookmarkmanager.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkmanager.h b/src/assistant/assistant/bookmarkmanager.h
index 9cae18f99..bbaa11a87 100644
--- a/src/assistant/assistant/bookmarkmanager.h
+++ b/src/assistant/assistant/bookmarkmanager.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkmanagerwidget.cpp b/src/assistant/assistant/bookmarkmanagerwidget.cpp
index d7513b50e..c489e9306 100644
--- a/src/assistant/assistant/bookmarkmanagerwidget.cpp
+++ b/src/assistant/assistant/bookmarkmanagerwidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkmanagerwidget.h b/src/assistant/assistant/bookmarkmanagerwidget.h
index fba0c818b..eb670af0f 100644
--- a/src/assistant/assistant/bookmarkmanagerwidget.h
+++ b/src/assistant/assistant/bookmarkmanagerwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkmodel.cpp b/src/assistant/assistant/bookmarkmodel.cpp
index 08e5d27d5..bc0677609 100644
--- a/src/assistant/assistant/bookmarkmodel.cpp
+++ b/src/assistant/assistant/bookmarkmodel.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/bookmarkmodel.h b/src/assistant/assistant/bookmarkmodel.h
index c2b0c472d..bd942e26a 100644
--- a/src/assistant/assistant/bookmarkmodel.h
+++ b/src/assistant/assistant/bookmarkmodel.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp
index 8df808f78..29648fe6f 100644
--- a/src/assistant/assistant/centralwidget.cpp
+++ b/src/assistant/assistant/centralwidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -339,6 +339,7 @@ void CentralWidget::connectTabBar()
}
// -- public slots
+
#ifndef QT_NO_CLIPBOARD
void CentralWidget::copy()
{
@@ -587,6 +588,17 @@ void CentralWidget::handleSourceChanged(const QUrl &url)
emit sourceChanged(url);
}
+void CentralWidget::slotHighlighted(const QString &link)
+{
+ TRACE_OBJ
+ QString resolvedLink = m_resolvedLinks.value(link);
+ if (!link.isEmpty() && resolvedLink.isEmpty()) {
+ resolvedLink = HelpEngineWrapper::instance().findFile(link).toString();
+ m_resolvedLinks.insert(link, resolvedLink);
+ }
+ emit highlighted(resolvedLink);
+}
+
// -- private
void CentralWidget::initPrinter()
@@ -609,9 +621,8 @@ void CentralWidget::connectSignals(HelpViewer *page)
SIGNAL(backwardAvailable(bool)));
connect(page, SIGNAL(sourceChanged(QUrl)), this,
SLOT(handleSourceChanged(QUrl)));
- connect(page, SIGNAL(highlighted(QString)), this,
- SIGNAL(highlighted(QString)));
connect(page, SIGNAL(printRequested()), this, SLOT(print()));
+ connect(page, SIGNAL(highlighted(QString)), this, SLOT(slotHighlighted(QString)));
}
bool CentralWidget::eventFilter(QObject *object, QEvent *e)
diff --git a/src/assistant/assistant/centralwidget.h b/src/assistant/assistant/centralwidget.h
index 2c6c4eef9..c3ef835d7 100644
--- a/src/assistant/assistant/centralwidget.h
+++ b/src/assistant/assistant/centralwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -155,6 +155,7 @@ private slots:
void highlightSearchTerms();
void printPreview(QPrinter *printer);
void handleSourceChanged(const QUrl &url);
+ void slotHighlighted(const QString &link);
private:
void initPrinter();
@@ -168,6 +169,7 @@ private:
FindWidget *m_findWidget;
QStackedWidget *m_stackedWidget;
TabBar *m_tabBar;
+ QHash<QString, QString> m_resolvedLinks;
};
QT_END_NAMESPACE
diff --git a/src/assistant/assistant/cmdlineparser.cpp b/src/assistant/assistant/cmdlineparser.cpp
index 0a5015201..a695a5786 100644
--- a/src/assistant/assistant/cmdlineparser.cpp
+++ b/src/assistant/assistant/cmdlineparser.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/cmdlineparser.h b/src/assistant/assistant/cmdlineparser.h
index f9d1f4cb6..c04001454 100644
--- a/src/assistant/assistant/cmdlineparser.h
+++ b/src/assistant/assistant/cmdlineparser.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/contentwindow.cpp b/src/assistant/assistant/contentwindow.cpp
index 3237b17c2..a511de982 100644
--- a/src/assistant/assistant/contentwindow.cpp
+++ b/src/assistant/assistant/contentwindow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/contentwindow.h b/src/assistant/assistant/contentwindow.h
index 18e97b782..02c94c576 100644
--- a/src/assistant/assistant/contentwindow.h
+++ b/src/assistant/assistant/contentwindow.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf
index 6c130d7f6..76e65903d 100644
--- a/src/assistant/assistant/doc/qtassistant.qdocconf
+++ b/src/assistant/assistant/doc/qtassistant.qdocconf
@@ -1,33 +1,33 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-project = qtassistant
+project = QtAssistant
description = Qt Assistant Manual
url = http://qt-project.org/doc/qtassistant
-qhp.projects = Assistant
-
-qhp.Assistant.file = qtassistant.qhp
-qhp.Assistant.namespace = org.qt-project.assistant.500
-qhp.Assistant.virtualFolder = assistant
-qhp.Assistant.indexTitle = Qt Assistant Manual
-
-qhp.Assistant.filterAttributes = qt 5.0.0 tools assistant
-qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
-qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
-qhp.Assistant.subprojects = manual examples
-qhp.Assistant.subprojects.manual.title = Manual
-qhp.Assistant.subprojects.manual.indexTitle = Qt Assistant Manual
-qhp.Assistant.subprojects.manual.selectors = fake:page
-qhp.Assistant.subprojects.examples.title = Examples
-qhp.Assistant.subprojects.examples.indexTitle = Qt Examples
-qhp.Assistant.subprojects.examples.selectors = fake:example
-qhp.Assistant.subprojects.examples.sortPages = true
+qhp.projects = QtAssistant
+
+qhp.QtAssistant.file = qtassistant.qhp
+qhp.QtAssistant.namespace = org.qt-project.assistant.500
+qhp.QtAssistant.virtualFolder = assistant
+qhp.QtAssistant.indexTitle = Qt Assistant Manual
+
+qhp.QtAssistant.filterAttributes = qt 5.0.1 tools assistant
+qhp.QtAssistant.customFilters.QtAssistant.name = Qt Assistant Manual
+qhp.QtAssistant.customFilters.QtAssistant.filterAttributes = qt tools assistant
+qhp.QtAssistant.subprojects = manual examples
+qhp.QtAssistant.subprojects.manual.title = Manual
+qhp.QtAssistant.subprojects.manual.indexTitle = Qt Assistant Manual
+qhp.QtAssistant.subprojects.manual.selectors = fake:page
+qhp.QtAssistant.subprojects.examples.title = Examples
+qhp.QtAssistant.subprojects.examples.indexTitle = Qt Assistant Examples
+qhp.QtAssistant.subprojects.examples.selectors = fake:example
+qhp.QtAssistant.subprojects.examples.sortPages = true
language = Cpp
sourcedirs = ..
-exampledirs = ../../../../examples \
+exampledirs = ../../../../examples/assistant \
snippets
imagedirs = images
diff --git a/src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc b/src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc
index 730373cd3..beb17059b 100644
--- a/src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc
+++ b/src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
diff --git a/src/assistant/assistant/doc/snippets/simpletextviewer/assistant.cpp b/src/assistant/assistant/doc/snippets/simpletextviewer/assistant.cpp
index 57588f837..f379717eb 100644
--- a/src/assistant/assistant/doc/snippets/simpletextviewer/assistant.cpp
+++ b/src/assistant/assistant/doc/snippets/simpletextviewer/assistant.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/src/assistant/assistant/doc/snippets/simpletextviewer/findfiledialog.cpp b/src/assistant/assistant/doc/snippets/simpletextviewer/findfiledialog.cpp
index e423c1308..a1c96607b 100644
--- a/src/assistant/assistant/doc/snippets/simpletextviewer/findfiledialog.cpp
+++ b/src/assistant/assistant/doc/snippets/simpletextviewer/findfiledialog.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/src/assistant/assistant/doc/snippets/simpletextviewer/mainwindow.cpp b/src/assistant/assistant/doc/snippets/simpletextviewer/mainwindow.cpp
index c4609153f..1f0b79f74 100644
--- a/src/assistant/assistant/doc/snippets/simpletextviewer/mainwindow.cpp
+++ b/src/assistant/assistant/doc/snippets/simpletextviewer/mainwindow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/src/assistant/assistant/doc/src/assistant-example.qdoc b/src/assistant/assistant/doc/src/assistant-example.qdoc
new file mode 100644
index 000000000..0ed7e6737
--- /dev/null
+++ b/src/assistant/assistant/doc/src/assistant-example.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \group examples-qtassistant
+ \ingroup all-examples
+ \title Qt Assistant Examples
+ \brief Using Qt Assistant as a help viewer for Qt applications.
+
+ \image assistant-examples.png
+
+ Qt Assistant provides support for interactive help and enables you to
+ display customer documentation to users of your Qt applications.
+
+ The following examples illustrate how to use Qt Assistant as a help viewer
+ for applications.
+
+*/
+
+/*
+ \list
+ \li \l{simpletextviewer}{Simple Text Viewer}\raisedaster
+ \li \l{remotecontrol}{Remote Control}
+ \endlist
+
+ Examples marked with an asterisk (*) are fully documented.
+*/
diff --git a/src/assistant/assistant/doc/src/assistant-manual.qdoc b/src/assistant/assistant/doc/src/assistant-manual.qdoc
index a96a4b4bb..aa426ee2f 100644
--- a/src/assistant/assistant/doc/src/assistant-manual.qdoc
+++ b/src/assistant/assistant/doc/src/assistant-manual.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
diff --git a/src/assistant/assistant/filternamedialog.cpp b/src/assistant/assistant/filternamedialog.cpp
index 6ade19e94..0460b9bfe 100644
--- a/src/assistant/assistant/filternamedialog.cpp
+++ b/src/assistant/assistant/filternamedialog.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/filternamedialog.h b/src/assistant/assistant/filternamedialog.h
index d3e772963..8ef59acb4 100644
--- a/src/assistant/assistant/filternamedialog.h
+++ b/src/assistant/assistant/filternamedialog.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/findwidget.cpp b/src/assistant/assistant/findwidget.cpp
index 0544c36f0..b9ba6bcbd 100644
--- a/src/assistant/assistant/findwidget.cpp
+++ b/src/assistant/assistant/findwidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/findwidget.h b/src/assistant/assistant/findwidget.h
index aad9aabad..c4e45ff77 100644
--- a/src/assistant/assistant/findwidget.h
+++ b/src/assistant/assistant/findwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/globalactions.cpp b/src/assistant/assistant/globalactions.cpp
index 2af9ed425..9e3b7595e 100644
--- a/src/assistant/assistant/globalactions.cpp
+++ b/src/assistant/assistant/globalactions.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/globalactions.h b/src/assistant/assistant/globalactions.h
index 3c5748703..65e917a9e 100644
--- a/src/assistant/assistant/globalactions.h
+++ b/src/assistant/assistant/globalactions.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/helpenginewrapper.cpp b/src/assistant/assistant/helpenginewrapper.cpp
index 0a9d423c6..f12fd069a 100644
--- a/src/assistant/assistant/helpenginewrapper.cpp
+++ b/src/assistant/assistant/helpenginewrapper.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -74,6 +74,7 @@ namespace {
const QString VersionKey(QString(QLatin1String("qtVersion%1$$$%2")).
arg(QLatin1String(QT_VERSION_STR)));
const QString ShowTabsKey(QLatin1String("showTabs"));
+ const QString TopicChooserGeometryKey(QLatin1String("TopicChooserGeometry"));
} // anonymous namespace
class TimeoutForwarder : public QObject
@@ -336,12 +337,6 @@ QString HelpEngineWrapper::error() const
return d->m_helpEngine->error();
}
-QString HelpEngineWrapper::virtualFolderForNameSpace(const QString &nameSpace) const
-{
- TRACE_OBJ
- return d->m_helpEngine->d->nameSpaceVirtualFolderMap.value(nameSpace, QString());
-}
-
const QStringList HelpEngineWrapper::qtDocInfo(const QString &component) const
{
TRACE_OBJ
@@ -730,6 +725,18 @@ bool HelpEngineWrapper::fullTextSearchFallbackEnabled() const
return CollectionConfiguration::fullTextSearchFallbackEnabled(*d->m_helpEngine);
}
+const QByteArray HelpEngineWrapper::topicChooserGeometry() const
+{
+ TRACE_OBJ
+ return d->m_helpEngine->customValue(TopicChooserGeometryKey).toByteArray();
+}
+
+void HelpEngineWrapper::setTopicChooserGeometry(const QByteArray &geometry)
+{
+ TRACE_OBJ
+ d->m_helpEngine->setCustomValue(TopicChooserGeometryKey, geometry);
+}
+
// -- TimeoutForwarder
TimeoutForwarder::TimeoutForwarder(const QString &fileName)
diff --git a/src/assistant/assistant/helpenginewrapper.h b/src/assistant/assistant/helpenginewrapper.h
index 8b8694698..994d2067d 100644
--- a/src/assistant/assistant/helpenginewrapper.h
+++ b/src/assistant/assistant/helpenginewrapper.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -100,7 +100,6 @@ public:
const QStringList filterAttributes() const;
const QStringList filterAttributes(const QString &filterName) const;
QString error() const;
- QString virtualFolderForNameSpace(const QString &nameSpace) const;
/*
* To be called after assistant has finished looking for new documentation.
@@ -192,6 +191,9 @@ public:
bool fullTextSearchFallbackEnabled() const;
+ const QByteArray topicChooserGeometry() const;
+ void setTopicChooserGeometry(const QByteArray &geometry);
+
signals:
// For asynchronous doc updates triggered by external actions.
diff --git a/src/assistant/assistant/helpviewer.cpp b/src/assistant/assistant/helpviewer.cpp
index 314a765e8..13c76cbb3 100644
--- a/src/assistant/assistant/helpviewer.cpp
+++ b/src/assistant/assistant/helpviewer.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -143,7 +143,7 @@ QString HelpViewer::mimeFromUrl(const QUrl &url)
return QLatin1String(e->mimeType);
++e;
}
- return QLatin1String("");
+ return QLatin1String("application/octet-stream");
}
bool HelpViewer::launchWithExternalApp(const QUrl &url)
@@ -177,31 +177,6 @@ bool HelpViewer::launchWithExternalApp(const QUrl &url)
return false;
}
-QString HelpViewer::fixupVirtualFolderForUrl(const HelpEngineWrapper *engine, const QUrl &url, bool *fixed)
-{
- TRACE_OBJ
- Q_ASSERT(engine);
-
- QString ret = url.toString();
- const QString virtualFolder = engine->virtualFolderForNameSpace(url.host());
- QString effectiveVirtualFolder = virtualFolder;
- const QStringList tokens = url.path().split('/');
- Q_FOREACH (const QString& token, tokens) {
- if (!token.isEmpty()) {
- effectiveVirtualFolder = token;
- break;
- }
- }
-
- if (QString::localeAwareCompare(effectiveVirtualFolder, virtualFolder)) {
- ret = url.scheme() + QLatin1String("://") + url.host() + QLatin1Char('/')
- + virtualFolder + QLatin1String("/..") + url.path();
- }
- if (fixed && engine->findFile(ret).isValid())
- *fixed = true;
- return ret;
-}
-
// -- public slots
void HelpViewer::home()
diff --git a/src/assistant/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h
index e61485859..7583e91f7 100644
--- a/src/assistant/assistant/helpviewer.h
+++ b/src/assistant/assistant/helpviewer.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -110,7 +110,6 @@ public:
static bool canOpenPage(const QString &url);
static QString mimeFromUrl(const QUrl &url);
static bool launchWithExternalApp(const QUrl &url);
- static QString fixupVirtualFolderForUrl(const HelpEngineWrapper *engine, const QUrl &url, bool *fixed = 0);
public slots:
#ifndef QT_NO_CLIPBOARD
diff --git a/src/assistant/assistant/helpviewer_p.h b/src/assistant/assistant/helpviewer_p.h
index ab81ceaed..136950e90 100644
--- a/src/assistant/assistant/helpviewer_p.h
+++ b/src/assistant/assistant/helpviewer_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/helpviewer_qtb.cpp b/src/assistant/assistant/helpviewer_qtb.cpp
index 146a55beb..93ccf0780 100644
--- a/src/assistant/assistant/helpviewer_qtb.cpp
+++ b/src/assistant/assistant/helpviewer_qtb.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -163,18 +163,14 @@ void HelpViewer::setSource(const QUrl &url)
return;
emit loadStarted();
- QString string = url.toString();
- const HelpEngineWrapper &engine = HelpEngineWrapper::instance();
- QUrl resolvedUrl = (string == QLatin1String("help") ? LocalHelpFile :
- engine.findFile(string));
- bool fileFound = resolvedUrl.isValid();
- if (!fileFound && isLocalUrl(url))
- resolvedUrl = fixupVirtualFolderForUrl(&engine, url, &fileFound);
+ bool helpOrAbout = (url.toString() == QLatin1String("help"));
+ const QUrl resolvedUrl = (helpOrAbout ? LocalHelpFile : HelpEngineWrapper::instance().findFile(url));
QTextBrowser::setSource(resolvedUrl);
- if (!fileFound) {
- setHtml(string == QLatin1String("about:blank") ? AboutBlank
- : PageNotFoundMessage.arg(url.toString()));
+
+ if (!resolvedUrl.isValid()) {
+ helpOrAbout = (url.toString() == QLatin1String("about:blank"));
+ setHtml(helpOrAbout ? AboutBlank : PageNotFoundMessage.arg(url.toString()));
}
emit loadFinished(true);
}
@@ -382,7 +378,7 @@ QVariant HelpViewer::loadResource(int type, const QUrl &name)
TRACE_OBJ
QByteArray ba;
if (type < 4) {
- QUrl url = fixupVirtualFolderForUrl(&HelpEngineWrapper::instance(), name);
+ const QUrl url = HelpEngineWrapper::instance().findFile(name);
ba = HelpEngineWrapper::instance().fileData(url);
if (url.toString().endsWith(QLatin1String(".svg"), Qt::CaseInsensitive)) {
QImage image;
diff --git a/src/assistant/assistant/helpviewer_qwv.cpp b/src/assistant/assistant/helpviewer_qwv.cpp
index 81fb82838..2d7632ac4 100644
--- a/src/assistant/assistant/helpviewer_qwv.cpp
+++ b/src/assistant/assistant/helpviewer_qwv.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -47,6 +47,7 @@
#include "openpagesmanager.h"
#include "tracer.h"
+#include <QClipboard>
#include <QtCore/QFileInfo>
#include <QtCore/QString>
#include <QtCore/QTimer>
@@ -133,6 +134,25 @@ qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
return len;
}
+// -- HelpRedirectNetworkReply
+
+class HelpRedirectNetworkReply : public QNetworkReply
+{
+public:
+ HelpRedirectNetworkReply(const QNetworkRequest &request, const QUrl &newUrl)
+ {
+ setRequest(request);
+ setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 301);
+ setAttribute(QNetworkRequest::RedirectionTargetAttribute, newUrl);
+
+ QTimer::singleShot(0, this, SIGNAL(finished()));
+ }
+
+protected:
+ void abort() { TRACE_OBJ }
+ qint64 readData(char*, qint64) { TRACE_OBJ return qint64(-1); }
+};
+
// -- HelpNetworkAccessManager
class HelpNetworkAccessManager : public QNetworkAccessManager
@@ -151,24 +171,21 @@ HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent)
TRACE_OBJ
}
-QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/,
- const QNetworkRequest &request, QIODevice* /*outgoingData*/)
+QNetworkReply *HelpNetworkAccessManager::createRequest(Operation, const QNetworkRequest &request, QIODevice*)
{
TRACE_OBJ
- QString url = request.url().toString();
-
const HelpEngineWrapper &engine = HelpEngineWrapper::instance();
- bool fileFound = engine.findFile(url).isValid();
- if (!fileFound && HelpViewer::isLocalUrl(request.url()))
- url = HelpViewer::fixupVirtualFolderForUrl(&engine, request.url(), &fileFound);
+ const QUrl url = engine.findFile(request.url());
+ if (url.isValid() && (url != request.url()))
+ return new HelpRedirectNetworkReply(request, url);
- const QString &mimeType = HelpViewer::mimeFromUrl(url);
- const QByteArray &data = fileFound ? engine.fileData(url) : QString::fromLatin1(g_htmlPage)
- .arg(g_percent1, g_percent2, HelpViewer::tr("Error loading: %1").arg(url), g_percent4).toUtf8();
+ if (url.isValid())
+ return new HelpNetworkReply(request, engine.fileData(url), HelpViewer::mimeFromUrl(url));
- return new HelpNetworkReply(request, data, mimeType.isEmpty()
- ? QLatin1String("application/octet-stream") : mimeType);
+ return new HelpNetworkReply(request, QString::fromLatin1(g_htmlPage).arg(g_percent1, g_percent2,
+ HelpViewer::tr("Error loading: %1").arg(request.url().toString()), g_percent4).toUtf8(),
+ QLatin1String("text/html"));
}
// -- HelpPage
@@ -223,6 +240,13 @@ void HelpPage::triggerAction(WebAction action, bool checked)
QWebPage::triggerAction(action, checked);
break;
}
+
+#ifndef QT_NO_CLIPBOARD
+ if (action == CopyLinkToClipboard || action == CopyImageUrlToClipboard) {
+ const QString link = QApplication::clipboard()->text();
+ QApplication::clipboard()->setText(HelpEngineWrapper::instance().findFile(link).toString());
+ }
+#endif
}
bool HelpPage::acceptNavigationRequest(QWebFrame *,
@@ -403,6 +427,7 @@ bool HelpViewer::findText(const QString &text, FindFlags flags, bool incremental
}
// -- public slots
+
#ifndef QT_NO_CLIPBOARD
void HelpViewer::copy()
{
diff --git a/src/assistant/assistant/indexwindow.cpp b/src/assistant/assistant/indexwindow.cpp
index 8b6ad7c7f..b0aeb72ff 100644
--- a/src/assistant/assistant/indexwindow.cpp
+++ b/src/assistant/assistant/indexwindow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/indexwindow.h b/src/assistant/assistant/indexwindow.h
index f2e6a1920..578d18710 100644
--- a/src/assistant/assistant/indexwindow.h
+++ b/src/assistant/assistant/indexwindow.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/installdialog.cpp b/src/assistant/assistant/installdialog.cpp
index 18262ea45..055b035cb 100644
--- a/src/assistant/assistant/installdialog.cpp
+++ b/src/assistant/assistant/installdialog.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/installdialog.h b/src/assistant/assistant/installdialog.h
index e62b1b87b..159a73d1c 100644
--- a/src/assistant/assistant/installdialog.h
+++ b/src/assistant/assistant/installdialog.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/main.cpp b/src/assistant/assistant/main.cpp
index 8532b754a..fabad3b51 100644
--- a/src/assistant/assistant/main.cpp
+++ b/src/assistant/assistant/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 1c447aff3..6f20e8221 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -374,7 +374,37 @@ void MainWindow::lookForNewQtDocumentation()
<< QLatin1String("designer")
<< QLatin1String("linguist")
<< QLatin1String("qmake")
- << QLatin1String("qt");
+ << QLatin1String("qt")
+ << QLatin1String("qtqmake")
+ << QLatin1String("activeqt")
+ << QLatin1String("qtassistant")
+ << QLatin1String("qtconcurrent")
+ << QLatin1String("qtcore")
+ << QLatin1String("qtdbus")
+ << QLatin1String("qtdesigner")
+ << QLatin1String("qtdoc")
+ << QLatin1String("qtgraphicaleffects")
+ << QLatin1String("qtgui")
+ << QLatin1String("qthelp")
+ << QLatin1String("qtimageformats")
+ << QLatin1String("qtlinguist")
+ << QLatin1String("qtmultimedia")
+ << QLatin1String("qtnetwork")
+ << QLatin1String("qtopengl")
+ << QLatin1String("qtprintsupport")
+ << QLatin1String("qtqml")
+ << QLatin1String("qtquick")
+ << QLatin1String("qtscript")
+ << QLatin1String("qtsql")
+ << QLatin1String("qtsvg")
+ << QLatin1String("qttestlib")
+ << QLatin1String("qtuitools")
+ << QLatin1String("qtwebkit")
+ << QLatin1String("qtwebkitexamples")
+ << QLatin1String("qtwidgets")
+ << QLatin1String("qtxml")
+ << QLatin1String("qtxmlpatterns");
+
QList<QtDocInstaller::DocInfo> qtDocInfos;
foreach (const QString &doc, docs)
qtDocInfos.append(QtDocInstaller::DocInfo(doc, helpEngine.qtDocInfo(doc)));
@@ -813,7 +843,7 @@ void MainWindow::showAboutDialog()
aboutDia.setText(tr("<center>"
"<h3>%1</h3>"
"<p>Version %2</p></center>"
- "<p>Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).</p>")
+ "<p>Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).</p>")
.arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)),
resources);
QLatin1String path(":/qt-project.org/assistant/images/assistant-128.png");
diff --git a/src/assistant/assistant/mainwindow.h b/src/assistant/assistant/mainwindow.h
index 0d79ef0b9..ec35cf46e 100644
--- a/src/assistant/assistant/mainwindow.h
+++ b/src/assistant/assistant/mainwindow.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/openpagesmanager.cpp b/src/assistant/assistant/openpagesmanager.cpp
index 1de433ed5..f86927cc9 100644
--- a/src/assistant/assistant/openpagesmanager.cpp
+++ b/src/assistant/assistant/openpagesmanager.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/openpagesmanager.h b/src/assistant/assistant/openpagesmanager.h
index 364f28666..6565b6a5a 100644
--- a/src/assistant/assistant/openpagesmanager.h
+++ b/src/assistant/assistant/openpagesmanager.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/openpagesmodel.cpp b/src/assistant/assistant/openpagesmodel.cpp
index 5b208c089..2b4e227f3 100644
--- a/src/assistant/assistant/openpagesmodel.cpp
+++ b/src/assistant/assistant/openpagesmodel.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/openpagesmodel.h b/src/assistant/assistant/openpagesmodel.h
index a67008d09..2d955126f 100644
--- a/src/assistant/assistant/openpagesmodel.h
+++ b/src/assistant/assistant/openpagesmodel.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/openpagesswitcher.cpp b/src/assistant/assistant/openpagesswitcher.cpp
index f19f4f0ca..fc5a97b06 100644
--- a/src/assistant/assistant/openpagesswitcher.cpp
+++ b/src/assistant/assistant/openpagesswitcher.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/openpagesswitcher.h b/src/assistant/assistant/openpagesswitcher.h
index 6a3f9903f..1c58b8c2d 100644
--- a/src/assistant/assistant/openpagesswitcher.h
+++ b/src/assistant/assistant/openpagesswitcher.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/openpageswidget.cpp b/src/assistant/assistant/openpageswidget.cpp
index 5ab08cfbe..c5a110aa7 100644
--- a/src/assistant/assistant/openpageswidget.cpp
+++ b/src/assistant/assistant/openpageswidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/openpageswidget.h b/src/assistant/assistant/openpageswidget.h
index a195854c2..6c9faf490 100644
--- a/src/assistant/assistant/openpageswidget.h
+++ b/src/assistant/assistant/openpageswidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Assistant module of the Qt Toolkit.
diff --git a/src/assistant/assistant/preferencesdialog.cpp b/src/assistant/assistant/preferencesdialog.cpp
index fdb784d3c..2df46acaa 100644
--- a/src/assistant/assistant/preferencesdialog.cpp
+++ b/src/assistant/assistant/preferencesdialog.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/preferencesdialog.h b/src/assistant/assistant/preferencesdialog.h
index ff5af88c4..d7ee5da0a 100644
--- a/src/assistant/assistant/preferencesdialog.h
+++ b/src/assistant/assistant/preferencesdialog.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/qtdocinstaller.cpp b/src/assistant/assistant/qtdocinstaller.cpp
index 042c46031..746436a61 100644
--- a/src/assistant/assistant/qtdocinstaller.cpp
+++ b/src/assistant/assistant/qtdocinstaller.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/qtdocinstaller.h b/src/assistant/assistant/qtdocinstaller.h
index c7a43aac4..2ecd40b62 100644
--- a/src/assistant/assistant/qtdocinstaller.h
+++ b/src/assistant/assistant/qtdocinstaller.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/remotecontrol.cpp b/src/assistant/assistant/remotecontrol.cpp
index d393c7053..8aa1e680a 100644
--- a/src/assistant/assistant/remotecontrol.cpp
+++ b/src/assistant/assistant/remotecontrol.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/remotecontrol.h b/src/assistant/assistant/remotecontrol.h
index 0d360ac71..ef374c2ca 100644
--- a/src/assistant/assistant/remotecontrol.h
+++ b/src/assistant/assistant/remotecontrol.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/remotecontrol_win.h b/src/assistant/assistant/remotecontrol_win.h
index 223726d38..1251b03a7 100644
--- a/src/assistant/assistant/remotecontrol_win.h
+++ b/src/assistant/assistant/remotecontrol_win.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/searchwidget.cpp b/src/assistant/assistant/searchwidget.cpp
index 1178ff9ab..4ac589032 100644
--- a/src/assistant/assistant/searchwidget.cpp
+++ b/src/assistant/assistant/searchwidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/searchwidget.h b/src/assistant/assistant/searchwidget.h
index bfc35b80e..256fbb038 100644
--- a/src/assistant/assistant/searchwidget.h
+++ b/src/assistant/assistant/searchwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/topicchooser.cpp b/src/assistant/assistant/topicchooser.cpp
index 7ff830354..79329dec1 100644
--- a/src/assistant/assistant/topicchooser.cpp
+++ b/src/assistant/assistant/topicchooser.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -41,47 +41,119 @@
#include "tracer.h"
#include "topicchooser.h"
+#include "helpenginewrapper.h"
+
+#include <QKeyEvent>
+#include <QStandardItemModel>
+#include <QSortFilterProxyModel>
+#include <QUrl>
QT_BEGIN_NAMESPACE
-TopicChooser::TopicChooser(QWidget *parent, const QString &keyword,
- const QMap<QString, QUrl> &links)
+TopicChooser::TopicChooser(QWidget *parent, const QString &keyword, const QMap<QString, QUrl> &links)
: QDialog(parent)
+ , m_filterModel(new QSortFilterProxyModel(this))
{
TRACE_OBJ
ui.setupUi(this);
+
+ setFocusProxy(ui.lineEdit);
+ ui.lineEdit->installEventFilter(this);
+ ui.lineEdit->setPlaceholderText(tr("Filter"));
ui.label->setText(tr("Choose a topic for <b>%1</b>:").arg(keyword));
+ QStandardItemModel *model = new QStandardItemModel(this);
+ m_filterModel->setSourceModel(model);
+ m_filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+
QMap<QString, QUrl>::const_iterator it = links.constBegin();
for (; it != links.constEnd(); ++it) {
- ui.listWidget->addItem(it.key());
m_links.append(it.value());
+ QStandardItem *item = new QStandardItem(it.key());
+ item->setToolTip(it.value().toString());
+ model->appendRow(item);
}
-
- if (ui.listWidget->count() != 0)
- ui.listWidget->setCurrentRow(0);
- ui.listWidget->setFocus();
- connect(ui.buttonDisplay, SIGNAL(clicked()), this, SLOT(accept()));
+ ui.listWidget->setModel(m_filterModel);
+ ui.listWidget->setUniformItemSizes(true);
+ ui.listWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
+
+ if (m_filterModel->rowCount() != 0)
+ ui.listWidget->setCurrentIndex(m_filterModel->index(0, 0));
+
connect(ui.buttonCancel, SIGNAL(clicked()), this, SLOT(reject()));
- connect(ui.listWidget, SIGNAL(itemActivated(QListWidgetItem*)), this,
- SLOT(accept()));
+ connect(ui.buttonDisplay, SIGNAL(clicked()), this, SLOT(acceptDialog()));
+ connect(ui.lineEdit, SIGNAL(textChanged(QString)), this, SLOT(setFilter(QString)));
+ connect(ui.listWidget, SIGNAL(activated(QModelIndex)), this, SLOT(activated(QModelIndex)));
+
+ const QByteArray ba = HelpEngineWrapper::instance().topicChooserGeometry();
+ if (!ba.isEmpty())
+ restoreGeometry(ba);
+}
+
+TopicChooser::~TopicChooser()
+{
+ HelpEngineWrapper::instance().setTopicChooserGeometry(saveGeometry());
}
QUrl TopicChooser::link() const
{
TRACE_OBJ
- QListWidgetItem *item = ui.listWidget->currentItem();
- if (!item)
- return QUrl();
+ if (m_activedIndex.isValid())
+ return m_links.at(m_filterModel->mapToSource(m_activedIndex).row());
+ return QUrl();
+}
+
+void TopicChooser::acceptDialog()
+{
+ TRACE_OBJ
+ m_activedIndex = ui.listWidget->currentIndex();
+ accept();
+}
- QString title = item->text();
- if (title.isEmpty())
- return QUrl();
+void TopicChooser::setFilter(const QString &pattern)
+{
+ TRACE_OBJ
+ m_filterModel->setFilterFixedString(pattern);
+ if (m_filterModel->rowCount() != 0 && !ui.listWidget->currentIndex().isValid())
+ ui.listWidget->setCurrentIndex(m_filterModel->index(0, 0));
+}
- const int row = ui.listWidget->row(item);
- Q_ASSERT(row < m_links.count());
- return m_links.at(row);
+void TopicChooser::activated(const QModelIndex &index)
+{
+ TRACE_OBJ
+ m_activedIndex = index;
+ accept();
+}
+
+bool TopicChooser::eventFilter(QObject *object, QEvent *event)
+{
+ TRACE_OBJ
+ if (object == ui.lineEdit && event->type() == QEvent::KeyPress) {
+ QModelIndex idx = ui.listWidget->currentIndex();
+ switch ((static_cast<QKeyEvent*>(event)->key())) {
+ case Qt::Key_Up:
+ idx = m_filterModel->index(idx.row() - 1, idx.column(),
+ idx.parent());
+ if (idx.isValid())
+ ui.listWidget->setCurrentIndex(idx);
+ break;
+
+ case Qt::Key_Down:
+ idx = m_filterModel->index(idx.row() + 1, idx.column(),
+ idx.parent());
+ if (idx.isValid())
+ ui.listWidget->setCurrentIndex(idx);
+ break;
+
+ default: ;
+ }
+ } else if (ui.lineEdit && event->type() == QEvent::FocusIn
+ && static_cast<QFocusEvent *>(event)->reason() != Qt::MouseFocusReason) {
+ ui.lineEdit->selectAll();
+ ui.lineEdit->setFocus();
+ }
+ return QDialog::eventFilter(object, event);
}
QT_END_NAMESPACE
diff --git a/src/assistant/assistant/topicchooser.h b/src/assistant/assistant/topicchooser.h
index e66a33720..1c4474a18 100644
--- a/src/assistant/assistant/topicchooser.h
+++ b/src/assistant/assistant/topicchooser.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -44,28 +44,36 @@
#include "ui_topicchooser.h"
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-
#include <QtWidgets/QDialog>
QT_BEGIN_NAMESPACE
+class QSortFilterProxyModel;
+
class TopicChooser : public QDialog
{
Q_OBJECT
public:
- TopicChooser(QWidget *parent, const QString &keyword,
- const QMap<QString, QUrl> &links);
+ TopicChooser(QWidget *parent, const QString &keyword, const QMap<QString, QUrl> &links);
+ ~TopicChooser();
+
+ QUrl link() const;
+
+private slots:
+ void acceptDialog();
+ void setFilter(const QString &pattern);
+ void activated(const QModelIndex &index);
+
+private:
+ bool eventFilter(QObject *object, QEvent *event);
- QUrl link() const;
-
private:
Ui::TopicChooser ui;
QList<QUrl> m_links;
+
+ QModelIndex m_activedIndex;
+ QSortFilterProxyModel *m_filterModel;
};
QT_END_NAMESPACE
diff --git a/src/assistant/assistant/topicchooser.ui b/src/assistant/assistant/topicchooser.ui
index d4c90bb4b..b28a5e76e 100644
--- a/src/assistant/assistant/topicchooser.ui
+++ b/src/assistant/assistant/topicchooser.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<UI version="4.0" stdsetdef="1" >
<class>TopicChooser</class>
<widget class="QDialog" name="TopicChooser" >
@@ -42,17 +43,12 @@
</widget>
</item>
<item>
- <widget class="QListWidget" name="listWidget" >
- <property name="objectName" >
- <string notr="true">listWidget</string>
- </property>
- </widget>
+ <widget class="QLineEdit" name="lineEdit" />
+ </item>
+ <item>
+ <widget class="QListView" name="listWidget" />
</item>
<item>
- <widget class="QWidget" name="Layout16" >
- <property name="objectName" >
- <string notr="true">Layout16</string>
- </property>
<layout class="QHBoxLayout" >
<property name="objectName" >
<string notr="true">unnamed</string>
@@ -107,9 +103,8 @@
<bool>true</bool>
</property>
</widget>
- </item>
- </layout>
- </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
diff --git a/src/assistant/assistant/tracer.h b/src/assistant/assistant/tracer.h
index 255441b06..be8878147 100644
--- a/src/assistant/assistant/tracer.h
+++ b/src/assistant/assistant/tracer.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/xbelsupport.cpp b/src/assistant/assistant/xbelsupport.cpp
index 069dcb117..c55e9a99e 100644
--- a/src/assistant/assistant/xbelsupport.cpp
+++ b/src/assistant/assistant/xbelsupport.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/assistant/xbelsupport.h b/src/assistant/assistant/xbelsupport.h
index 5972d1ba4..fb5c15cbb 100644
--- a/src/assistant/assistant/xbelsupport.h
+++ b/src/assistant/assistant/xbelsupport.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/clucene/clucene.pro b/src/assistant/clucene/clucene.pro
index 63c2e32c8..49bdb9d6f 100644
--- a/src/assistant/clucene/clucene.pro
+++ b/src/assistant/clucene/clucene.pro
@@ -8,7 +8,7 @@ load(qt_module)
include(fulltextsearch.pri)
-CONFIG += qt warn_off
+CONFIG += warn_off
contains(QT_CONFIG, reduce_exports) {
CONFIG += hide_symbols
# workaround for compiler errors on Ubuntu
diff --git a/src/assistant/clucene/qanalyzer.cpp b/src/assistant/clucene/qanalyzer.cpp
index 555f472ab..1bd67d10e 100644
--- a/src/assistant/clucene/qanalyzer.cpp
+++ b/src/assistant/clucene/qanalyzer.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qanalyzer_p.h b/src/assistant/clucene/qanalyzer_p.h
index a376ee1fb..d53f0c654 100644
--- a/src/assistant/clucene/qanalyzer_p.h
+++ b/src/assistant/clucene/qanalyzer_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qclucene-config_p.h b/src/assistant/clucene/qclucene-config_p.h
index 6bd2ce9b1..4b098bcf5 100644
--- a/src/assistant/clucene/qclucene-config_p.h
+++ b/src/assistant/clucene/qclucene-config_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h
index e84fa2812..738e9672d 100644
--- a/src/assistant/clucene/qclucene_global_p.h
+++ b/src/assistant/clucene/qclucene_global_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
@@ -102,8 +102,8 @@ QT_BEGIN_NAMESPACE
# define CL_NS2(sub,sub2)
#endif
-namespace {
- TCHAR* QStringToTChar(const QString &str)
+namespace QtCLuceneHelpers {
+ inline TCHAR* QStringToTChar(const QString &str)
{
TCHAR *string = new TCHAR[(str.length() +1) * sizeof(TCHAR)];
memset(string, 0, (str.length() +1) * sizeof(TCHAR));
@@ -116,7 +116,7 @@ namespace {
return string;
}
- QString TCharToQString(const TCHAR *string)
+ inline QString TCharToQString(const TCHAR *string)
{
#if defined(UNICODE) || defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
QString retValue = QString::fromWCharArray(string);
@@ -126,6 +126,7 @@ namespace {
#endif
}
}
+using namespace QtCLuceneHelpers;
QT_END_NAMESPACE
diff --git a/src/assistant/clucene/qdocument.cpp b/src/assistant/clucene/qdocument.cpp
index e9b6c793b..87ce943d0 100644
--- a/src/assistant/clucene/qdocument.cpp
+++ b/src/assistant/clucene/qdocument.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qdocument_p.h b/src/assistant/clucene/qdocument_p.h
index 2969450ff..c415b2628 100644
--- a/src/assistant/clucene/qdocument_p.h
+++ b/src/assistant/clucene/qdocument_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qfield.cpp b/src/assistant/clucene/qfield.cpp
index 91617fc98..b62cdc758 100644
--- a/src/assistant/clucene/qfield.cpp
+++ b/src/assistant/clucene/qfield.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qfield_p.h b/src/assistant/clucene/qfield_p.h
index e37d2e7f3..5bce06f99 100644
--- a/src/assistant/clucene/qfield_p.h
+++ b/src/assistant/clucene/qfield_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qfilter.cpp b/src/assistant/clucene/qfilter.cpp
index 8c7f91794..f54b637e4 100644
--- a/src/assistant/clucene/qfilter.cpp
+++ b/src/assistant/clucene/qfilter.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qfilter_p.h b/src/assistant/clucene/qfilter_p.h
index 5f55c23f3..c895fa48b 100644
--- a/src/assistant/clucene/qfilter_p.h
+++ b/src/assistant/clucene/qfilter_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qhits.cpp b/src/assistant/clucene/qhits.cpp
index 38b5f5a10..52fb9483e 100644
--- a/src/assistant/clucene/qhits.cpp
+++ b/src/assistant/clucene/qhits.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qhits_p.h b/src/assistant/clucene/qhits_p.h
index 444e65e15..2b857233b 100644
--- a/src/assistant/clucene/qhits_p.h
+++ b/src/assistant/clucene/qhits_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qindexreader.cpp b/src/assistant/clucene/qindexreader.cpp
index b27d35ef0..60fe10d41 100644
--- a/src/assistant/clucene/qindexreader.cpp
+++ b/src/assistant/clucene/qindexreader.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qindexreader_p.h b/src/assistant/clucene/qindexreader_p.h
index 9787837b7..4baf0e48e 100644
--- a/src/assistant/clucene/qindexreader_p.h
+++ b/src/assistant/clucene/qindexreader_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qindexwriter.cpp b/src/assistant/clucene/qindexwriter.cpp
index 4b1557ae5..d07ee475a 100644
--- a/src/assistant/clucene/qindexwriter.cpp
+++ b/src/assistant/clucene/qindexwriter.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qindexwriter_p.h b/src/assistant/clucene/qindexwriter_p.h
index ff9f5f079..20ac8b309 100644
--- a/src/assistant/clucene/qindexwriter_p.h
+++ b/src/assistant/clucene/qindexwriter_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qquery.cpp b/src/assistant/clucene/qquery.cpp
index b8ea8f46f..350868c02 100644
--- a/src/assistant/clucene/qquery.cpp
+++ b/src/assistant/clucene/qquery.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qquery_p.h b/src/assistant/clucene/qquery_p.h
index d1fb52a02..291d426dc 100644
--- a/src/assistant/clucene/qquery_p.h
+++ b/src/assistant/clucene/qquery_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qqueryparser.cpp b/src/assistant/clucene/qqueryparser.cpp
index 3823970c0..2b934849c 100644
--- a/src/assistant/clucene/qqueryparser.cpp
+++ b/src/assistant/clucene/qqueryparser.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qqueryparser_p.h b/src/assistant/clucene/qqueryparser_p.h
index 2fff243dc..362d829c7 100644
--- a/src/assistant/clucene/qqueryparser_p.h
+++ b/src/assistant/clucene/qqueryparser_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qreader.cpp b/src/assistant/clucene/qreader.cpp
index 4067a6e16..b25f2c7d4 100644
--- a/src/assistant/clucene/qreader.cpp
+++ b/src/assistant/clucene/qreader.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qreader_p.h b/src/assistant/clucene/qreader_p.h
index 87c5d2d89..64f8f64f9 100644
--- a/src/assistant/clucene/qreader_p.h
+++ b/src/assistant/clucene/qreader_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qsearchable.cpp b/src/assistant/clucene/qsearchable.cpp
index 44c7f59cd..368e48cfd 100644
--- a/src/assistant/clucene/qsearchable.cpp
+++ b/src/assistant/clucene/qsearchable.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qsearchable_p.h b/src/assistant/clucene/qsearchable_p.h
index a051ce20f..d4aa715dd 100644
--- a/src/assistant/clucene/qsearchable_p.h
+++ b/src/assistant/clucene/qsearchable_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qsort.cpp b/src/assistant/clucene/qsort.cpp
index 3326f4172..fcb43832e 100644
--- a/src/assistant/clucene/qsort.cpp
+++ b/src/assistant/clucene/qsort.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qsort_p.h b/src/assistant/clucene/qsort_p.h
index e37772f5d..1ed00e684 100644
--- a/src/assistant/clucene/qsort_p.h
+++ b/src/assistant/clucene/qsort_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qterm.cpp b/src/assistant/clucene/qterm.cpp
index fe22e4cdf..2a5c980e3 100644
--- a/src/assistant/clucene/qterm.cpp
+++ b/src/assistant/clucene/qterm.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qterm_p.h b/src/assistant/clucene/qterm_p.h
index e578989fb..74eb603ef 100644
--- a/src/assistant/clucene/qterm_p.h
+++ b/src/assistant/clucene/qterm_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qtoken.cpp b/src/assistant/clucene/qtoken.cpp
index 7e8620841..18c23115b 100644
--- a/src/assistant/clucene/qtoken.cpp
+++ b/src/assistant/clucene/qtoken.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qtoken_p.h b/src/assistant/clucene/qtoken_p.h
index 961961765..0e774dc4e 100644
--- a/src/assistant/clucene/qtoken_p.h
+++ b/src/assistant/clucene/qtoken_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qtokenizer.cpp b/src/assistant/clucene/qtokenizer.cpp
index f0cb4993e..32eab930b 100644
--- a/src/assistant/clucene/qtokenizer.cpp
+++ b/src/assistant/clucene/qtokenizer.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qtokenizer_p.h b/src/assistant/clucene/qtokenizer_p.h
index aa8875336..420961820 100644
--- a/src/assistant/clucene/qtokenizer_p.h
+++ b/src/assistant/clucene/qtokenizer_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qtokenstream.cpp b/src/assistant/clucene/qtokenstream.cpp
index b578fa8bb..bcceb9a5c 100644
--- a/src/assistant/clucene/qtokenstream.cpp
+++ b/src/assistant/clucene/qtokenstream.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/clucene/qtokenstream_p.h b/src/assistant/clucene/qtokenstream_p.h
index dce5970aa..21c2a1566 100644
--- a/src/assistant/clucene/qtokenstream_p.h
+++ b/src/assistant/clucene/qtokenstream_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
** All rights reserved.
**
-** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
**
** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf
new file mode 100644
index 000000000..2d05db5a5
--- /dev/null
+++ b/src/assistant/help/doc/qthelp.qdocconf
@@ -0,0 +1,38 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project = QtHelp
+description = Qt Help Reference Documentation
+url = http://qt-project.org/doc/qthelp
+version = 5.0.1
+
+examplesinstallpath = help
+
+qhp.projects = QtHelp
+
+qhp.QtHelp.file = qthelp.qhp
+qhp.QtHelp.namespace = org.qt-project.qthelp.500
+qhp.QtHelp.virtualFolder = qthelp
+qhp.QtHelp.indexTitle = Qt Help
+qhp.QtHelp.indexRoot =
+
+qhp.QtHelp.filterAttributes = qthelp 5.0.1 tools assistant qtrefdoc
+qhp.QtHelp.customFilters.QtHelp.name = QtHelp 5.0.1
+qhp.QtHelp.customFilters.QtHelp.filterAttributes = qthelp 5.0.1
+qhp.QtHelp.subprojects = classes
+qhp.QtHelp.subprojects.classes.title = C++ Classes
+qhp.QtHelp.subprojects.classes.indexTitle = Qt Help C++ Classes
+qhp.QtHelp.subprojects.classes.selectors = class fake:headerfile
+qhp.QtHelp.subprojects.classes.sortPages = true
+
+language = Cpp
+
+depends += qtdoc qtbase qtcore qtassistant
+
+headerdirs += ..
+
+sourcedirs = ..
+
+exampledirs = ../../../../examples/help \
+ snippets
+
+imagedirs = images
diff --git a/src/assistant/help/doc/snippets/doc_src_qthelp.cpp b/src/assistant/help/doc/snippets/doc_src_qthelp.cpp
new file mode 100644
index 000000000..4d31e4499
--- /dev/null
+++ b/src/assistant/help/doc/snippets/doc_src_qthelp.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtHelp>
+//! [0]
+
+//! [6]
+QHelpEngineCore helpEngine("mycollection.qhc");
+...
+
+// get all file references for the identifier
+QMap<QString, QUrl> links =
+ helpEngine.linksForIdentifier(QLatin1String("MyDialog::ChangeButton"));
+
+// If help is available for this keyword, get the help data
+// of the first file reference.
+if (links.count()) {
+ QByteArray helpData = helpEngine->fileData(links.constBegin().value());
+ // show the documentation to the user
+ if (!helpData.isEmpty())
+ displayHelp(helpData);
+}
+//! [6]
+
+
diff --git a/src/assistant/help/doc/snippets/doc_src_qthelp.qdoc b/src/assistant/help/doc/snippets/doc_src_qthelp.qdoc
new file mode 100644
index 000000000..c8f2ed960
--- /dev/null
+++ b/src/assistant/help/doc/snippets/doc_src_qthelp.qdoc
@@ -0,0 +1,175 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [1]
+CONFIG += help
+//! [1]
+
+
+//! [2]
+qhelpgenerator doc.qhp -o doc.qch
+//! [2]
+
+
+//! [3]
+<?xml version="1.0" encoding="utf-8" ?>
+<QHelpCollectionProject version="1.0">
+ <docFiles>
+ <register>
+ <file>doc.qch</file>
+ </register>
+ </docFiles>
+</QHelpCollectionProject>
+//! [3]
+
+
+//! [4]
+qcollectiongenerator mycollection.qhcp -o mycollection.qhc
+//! [4]
+
+
+//! [5]
+...
+<docFiles>
+ <generate>
+ <file>
+ <input>doc.qhp</input>
+ <output>doc.qch</output>
+ </file>
+ </generate>
+ <register>
+ <file>doc.qch</file>
+ </register>
+</docFiles>
+...
+//! [5]
+
+
+//! [7]
+<?xml version="1.0" encoding="UTF-8"?>
+<QtHelpProject version="1.0">
+ <namespace>mycompany.com.myapplication.1.0</namespace>
+ <virtualFolder>doc</virtualFolder>
+ <customFilter name="My Application 1.0">
+ <filterAttribute>myapp</filterAttribute>
+ <filterAttribute>1.0</filterAttribute>
+ </customFilter>
+ <filterSection>
+ <filterAttribute>myapp</filterAttribute>
+ <filterAttribute>1.0</filterAttribute>
+ <toc>
+ <section title="My Application Manual" ref="index.html">
+ <section title="Chapter 1" ref="doc.html#chapter1"/>
+ <section title="Chapter 2" ref="doc.html#chapter2"/>
+ <section title="Chapter 3" ref="doc.html#chapter3"/>
+ </section>
+ </toc>
+ <keywords>
+ <keyword name="foo" id="MyApplication::foo" ref="doc.html#foo"/>
+ <keyword name="bar" ref="doc.html#bar"/>
+ <keyword id="MyApplication::foobar" ref="doc.html#foobar"/>
+ </keywords>
+ <files>
+ <file>classic.css</file>
+ <file>*.html</file>
+ </files>
+ </filterSection>
+</QtHelpProject>
+//! [7]
+
+
+//! [8]
+...
+<virtualFolder>doc</virtualFolder>
+...
+//! [8]
+
+
+//! [9]
+...
+<customFilter name="My Application 1.0">
+ <filterAttribute>myapp</filterAttribute>
+ <filterAttribute>1.0</filterAttribute>
+</customFilter>
+...
+//! [9]
+
+
+//! [10]
+...
+<filterSection>
+ <filterAttribute>myapp</filterAttribute>
+ <filterAttribute>1.0</filterAttribute>
+...
+//! [10]
+
+
+//! [11]
+...
+<toc>
+ <section title="My Application Manual" ref="index.html">
+ <section title="Chapter 1" ref="doc.html#chapter1"/>
+ <section title="Chapter 2" ref="doc.html#chapter2"/>
+ <section title="Chapter 3" ref="doc.html#chapter3"/>
+ </section>
+</toc>
+...
+//! [11]
+
+
+//! [12]
+...
+<keywords>
+ <keyword name="foo" id="MyApplication::foo" ref="doc.html#foo"/>
+ <keyword name="bar" ref="doc.html#bar"/>
+ <keyword id="MyApplication::foobar" ref="doc.html#foobar"/>
+</keywords>
+...
+//! [12]
+
+
+//! [13]
+...
+<files>
+ <file>classic.css</file>
+ <file>*.html</file>
+</files>
+...
+//! [13]
diff --git a/src/assistant/help/doc/src/qthelp-examples.qdoc b/src/assistant/help/doc/src/qthelp-examples.qdoc
new file mode 100644
index 000000000..2f10cfc96
--- /dev/null
+++ b/src/assistant/help/doc/src/qthelp-examples.qdoc
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \group examples-qthelp
+ \ingroup all-examples
+ \title Qt Help Examples
+ \brief Adding context-sensitive help to Qt applications.
+
+ The Qt help system includes tools for generating and viewing Qt help files.
+ In addition, it provides classes for accessing help contents programatically
+ to be able to integrate online help into Qt applications.
+
+ The following example illustrates how to add context-sensitive help to
+ applications.
+
+*/
+
+/*
+ \list
+ \li \l{contextsensitivehelp}{Context-Sensitive Help}
+ \endlist
+*/
diff --git a/src/assistant/help/doc/src/qthelp-index.qdoc b/src/assistant/help/doc/src/qthelp-index.qdoc
new file mode 100644
index 000000000..fe2b930f8
--- /dev/null
+++ b/src/assistant/help/doc/src/qthelp-index.qdoc
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \page qthelp-index.html
+ \title Qt Help
+
+ \brief The QtHelp module provides classes for integrating
+ online documentation in applications.
+
+ \section1 Getting Started
+
+ To use Qt Help classes, add this directive into the C++ files:
+
+ \snippet doc_src_qthelp.cpp 0
+
+ To link against the Qt Help module, add this line to the project file:
+
+ \snippet doc_src_qthelp.qdoc 1
+
+ \section1 Articles and Guides
+
+ The classes and tools supplied with Qt to enable developers to include
+ online help and documentation in their applications are described in
+ more detail in \l{The Qt Help Framework}.
+
+ \section1 API Reference
+
+ These are links to the API reference material:
+
+ \list
+ \li \l{Qt Help C++ Classes}{C++ Classes}
+ \endlist
+
+ \section1 License Information
+
+ Qt Help uses the CLucene indexing library to provide full-text searching
+ capabilities for Qt Assistant and applications that use Qt Help features.
+
+ Developers using the \l{Qt Commercial License} who wish to distribute
+ applications that use the Qt Help features need to be aware of their
+ obligations under the GNU Lesser General Public License (LGPL).
+
+ Developers using the Open Source Edition can choose to redistribute
+ the module under the appropriate version of the GNU LGPL; version 2.1
+ for applications and libraries licensed under the GNU GPL version 2,
+ or version 3 for applications and libraries licensed under the GNU
+ GPL version 3.
+
+ \legalese
+ Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team \BR
+ Changes are Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ \endlegalese
+
+*/
diff --git a/src/assistant/help/doc/src/qthelp-module.qdoc b/src/assistant/help/doc/src/qthelp-module.qdoc
new file mode 100644
index 000000000..e8fd17f9f
--- /dev/null
+++ b/src/assistant/help/doc/src/qthelp-module.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \module QtHelp
+ \title Qt Help C++ Classes
+ \ingroup modules
+
+ \brief Provides classes for integrating online documentation in
+ applications.
+
+ The classes and tools supplied with Qt to enable developers to include
+ online help and documentation in their applications are described in
+ more detail in \l{The Qt Help Framework} overview document.
+
+ To include the definitions of the module's classes, use the
+ following directive:
+
+ \snippet doc_src_qthelp.cpp 0
+
+ To link against the module, add this line to your \l qmake \c
+ .pro file:
+
+ \snippet doc_src_qthelp.qdoc 1
+
+*/
diff --git a/src/assistant/help/doc/src/qthelp.qdoc b/src/assistant/help/doc/src/qthelp.qdoc
new file mode 100644
index 000000000..4e685907c
--- /dev/null
+++ b/src/assistant/help/doc/src/qthelp.qdoc
@@ -0,0 +1,363 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \group helpsystem
+ \title Help System
+ \ingroup groups
+
+ \brief Classes used to provide online-help for applications.
+
+ \keyword help system
+
+ These classes provide for all forms of online-help in your application,
+ with three levels of detail:
+
+ \list 1
+ \li Tool Tips and Status Bar message - flyweight help, extremely brief,
+ entirely integrated in the user interface, requiring little
+ or no user interaction to invoke.
+ \li What's This? - lightweight, but can be
+ a three-paragraph explanation.
+ \li Online Help - can encompass any amount of information,
+ but is typically slower to call up, somewhat separated
+ from the user's work, and often users feel that using online
+ help is a digression from their real task.
+ \endlist
+
+*/
+
+/*!
+ \page qthelp-framework.html
+ \title The Qt Help Framework
+ \brief Integrating Documentation in Applications
+ \ingroup frameworks-technologies
+
+ \section1 Overview
+ The Qt help system includes tools for generating and viewing
+ Qt help files. In addition it provides classes for accessing
+ help contents programatically to be able to integrate online
+ help into Qt applications.
+
+ The actual help data, meaning the table of contents, index
+ keywords or html documents, is contained in Qt compressed help
+ files. So, one such a help file represents usually one manual
+ or documentation set. Since most products are more comprehensive
+ and consist of a number of tools, one manual is rarely enough.
+ Instead, more manuals which should be accessible at the same
+ time, exist. Ideally, it should also be possible to reference
+ certain points of interest of one manual to another.
+ Therefore, the Qt help system operates on help collection files
+ which include any number of compressed help files.
+
+ However, having collection files to merge many documentation
+ sets may lead to some problems. For example, one index keyword
+ may be defined in different documentations. So, when only seeing
+ it in the index and activating it, you cannot be sure that
+ the expected documentation will be shown. Therefore, the Qt
+ help system offers the possibiltiy to filter the help contents
+ after certain attributes. This requires however, that the
+ attributes have been assigned to the help contents before the
+ generation of the compressed help file.
+
+ As already mentioned, the Qt compressed help file contains all
+ data, so there is no need any longer to ship all single html
+ files. Instead, only the compressed help file and optionally the
+ collection file has to be distributed. The collection file is
+ optional since any existing collection file, e.g. from an older
+ release could be used.
+
+ So, in general, there are four files interacting with the help
+ system, two used for generating Qt help and two meant for
+ distribution:
+
+ \table
+ \header
+ \li Name
+ \li Extension
+ \li Brief Description
+ \row
+ \li \l {Qt Help Project}
+ \li .qhp
+ \li The input file for the help generator consisting of the table
+ of contents, indices and references to the actual documentation
+ files (*.html); it also defines a unique namespace for the
+ documentation.
+
+ \row
+ \li Qt Compressed Help
+ \li .qch
+ \li The output file of the help generator. This binary file contains
+ all information specified in the help project file along with all
+ compressed documentation files.
+
+ \row
+ \li \l {Qt Help Collection Project}
+ \li .qhcp
+ \li The input file for the help collection generator. It contains
+ references to compressed help files which should be included in
+ the collection; it also may contain other information for
+ customizing Qt Assistant.
+
+ \row
+ \li Qt Help Collection
+ \li .qhc
+ \li The output of the help collection generator. This is the file
+ QHelpEngine operates on. It contains references to any number of
+ compressed help files as well as additional information, such as
+ custom filters.
+ \endtable
+
+ \section1 Generating Qt Help
+
+ Building help files for the Qt help system assumes that the html
+ documentation files already exist, i.e. the Qt help system does
+ not offer the possibility to create html files like e.g. Doxygen.
+
+ Once the html documentents are in place, a \l {Qt Help Project} file
+ has to be created. After specifying all relevant information in
+ this file, it needs to be compiled by calling:
+
+ \snippet doc_src_qthelp.qdoc 2
+
+ The file 'doc.qch' contains then all html files in compressed
+ form along with the table of contents and index keywords. To
+ test if the generated file is correct, open Qt Assistant and
+ install the file via the Settings|Documentation page.
+
+ \target Qt Help Collection Project
+ \section2 Creating a Qt Help Collection
+
+ The first step is to create a Qt Help Collection Project file.
+ Since a Qt help collection stores primarily references to
+ compressed help files, the project 'mycollection.qhcp' file
+ looks unsurprisingly simple:
+
+ \snippet doc_src_qthelp.qdoc 3
+
+ For actually creating the collection file call:
+
+ \snippet doc_src_qthelp.qdoc 4
+
+ Instead of running two tools, one for generating the compressed
+ help and one for generating the collection file, it is also
+ possible to just run the qcollectiongenerator tool with a
+ slightly modified project file instructing the generator to
+ create the compressed help first.
+
+ \snippet doc_src_qthelp.qdoc 5
+
+ Of course, it is possible to specify more than one file in the
+ 'generate' or 'register' section, so any number of compressed
+ help files can be generated and registered in one go.
+
+ \section1 Using Qt Help
+
+ Accessing the help contents can be done in two ways: Using Qt
+ Assistant as documentation browser or using the QHelpEngine
+ API for embedding the help contents directly in an application.
+
+ \section2 Using Qt Assistant
+
+ \QA operates on a collection file which can be specified
+ before start up. If no collection file is given, a default one
+ will be created and used. In either case, it is possible to
+ register any Qt compressed help file and access the help contents.
+
+ When using Qt Assistant as the help browser for an application, it
+ would be desirable that it can be customized to fit better to the
+ application and doesn't look like an independent, standalone
+ help browser. To achieve this, several additional properties can
+ be set in an Qt help collection file, to change e.g. the title
+ or application icon of Qt Assistant. For more information,see the
+ \l{Qt Assistant Manual}.
+
+ \section2 Using QHelpEngine API
+
+ Instead of showing the help in an external application like the
+ Qt Assistant, it is also possible to embed the online help in
+ the application. The contents can then be retrieved via the
+ QHelpEngine class and can be displayed in nearly any form.
+ Showing it in a QTextBrowser is probably the most common way, but
+ embedding it in What's This help is also perfectly possible.
+
+ Retrieving help data from the file engine does not involve a
+ lot of code. The first step is to create an instance of the
+ help engine. Then we ask the engine for the links assigned to
+ the identifier, in this case "MyDialog::ChangeButton". If a link
+ was found, meaning at least one help document exists to this topic,
+ we get the actual help contents by calling fileData() and display
+ the document to the user.
+
+ \snippet doc_src_qthelp.cpp 6
+
+ For further information on how to use the API, have a look at
+ the QHelpEngine class reference.
+*/
+
+/*!
+ \page qthelpproject.html
+ \title Qt Help Project
+
+ A Qt help project collects all data necessary to generate a
+ compressed help file. Along with the actual help data, like
+ the table of contents, index keywords and help documents, it
+ contains some extra information like a namespace to identify
+ the help file. One help project stands for one documentation,
+ for example the \l{Qt Assistant Manual}.
+
+ \section1 Qt Help Project File Format
+
+ The file format is XML-based. For a better understanding of
+ the format we'll discuss the following example:
+
+ \snippet doc_src_qthelp.qdoc 7
+
+ \section2 Namespace
+
+ To enable the QHelpEngine to retrieve the proper documentation to
+ a given link, every documentation set has to have a unique
+ identifier. A unique identifier makes is also possible for the
+ help collection to keep track of a documentation set without relying
+ on its file name. The Qt help system uses a namespace as identifier
+ which is defined by the mandatory namespace tags. In the example
+ above, the namespace is "mycompany.com.myapplication.1.0".
+
+ \target Virtual Folders
+ \section2 Virtual Folders
+
+ Having a namespace for every documentation naturally means that
+ the documentation sets are quite separated. From the help engines
+ point of view this is beneficial, but from the documentors view
+ it is often desirable to cross reference certain topic from one
+ manual to another without having to specify absolute links. To
+ solve this problem, the help system introduced the concept of
+ virtual folders.
+
+ A virtual folder will become the root directory of all files
+ referenced in a compressed help file. When two documentations
+ share the same virtual folder, they can use relative paths when
+ defining hyperlinks pointing to the other documentation. If a
+ file is contained in both documentations or manuals, the one
+ from the current manual has precedence over the other.
+
+ \snippet doc_src_qthelp.qdoc 8
+
+ The above example specifies 'doc' as virtual folder. If another
+ manual, e.g. for a small helper tool for 'My Application'
+ specifies the same folder, it is sufficient to write
+ 'doc.html#section1' to reference the first section in the
+ 'My Application' manual.
+
+ The virtual folder tag is mandatory and the folder must not
+ contain any '/'.
+
+ \target Custom Filters
+ \section2 Custom Filters
+
+ Next in the Qt help project file are the optional definitions of
+ custom filters. A custom filter contains a list of filter
+ attributes which will be used later to display only the documentation
+ which has all those attributes assigned to. So, when setting the
+ current filter in the QHelpEngine to "My Application 1.0" only
+ the documentation which has "myapp" and "1.0" set as filter
+ attributes will be shown.
+
+ \snippet doc_src_qthelp.qdoc 9
+
+ It is possible to define any number of custom filters in a help
+ project file. Important to know is, that the filter attributes have
+ not to be specified in the same project file; they can be defined
+ in any other help file. The definition of a filter attributes
+ takes place by specifying them in a filter section.
+
+ \target Filter Section
+ \section2 Filter Section
+
+ A filter section contains the actual documentation. One Qt help project
+ file may contain more than one filter sections. Every filter section
+ consists of four parts, the filter attributes section, the table of
+ contents, the keywords and the files list. In theory all parts are
+ optional but not specifying anything there will result in an empty
+ documentation.
+
+ \section3 Filter Attributes
+
+ Every filter section should have filter attributes assigned to it, to
+ enable documentation filtering. If no filter attribute is defined, the
+ documentation will only be shown if no filtering occurs, meaning the
+ current custom filter in the QHelpEngine does not contain any filter
+ attributes.
+
+ \snippet doc_src_qthelp.qdoc 10
+
+ In this case, the filter attributes 'myapp' and '1.0' are assigned
+ to the filter section, i.e. all contents specified in this section
+ will only be shown if the current custom filter has 'myapp' or '1.0'
+ or both as filter attributes.
+
+ \section3 Table of contents
+
+ \snippet doc_src_qthelp.qdoc 11
+
+ One section tag represents one item in the table of contents. The
+ sections can be nested to any degree, but from a users perspective
+ it should not be more than four or five levels. A section is defined
+ by its title and reference. The reference, like all file references in a Qt
+ help project, are relative to the help project file itself.
+ \note The referenced files must be inside the same directory (or within a
+ subdirectory) as the help project file. An absolute file path is not supported
+ either.
+
+ \section3 Keywords
+
+ \snippet doc_src_qthelp.qdoc 12
+
+ The keyword section lists all keywords of this filter section. A
+ keyword consists basically of a name and a file reference. If the
+ attribute 'name' is used then the keyword specified there will appear in
+ the visible index, i.e. it will be accessible through the QHelpIndexModel.
+ If 'id' is used, the keyword does not appear in the index and is
+ only accessible via the linksForIdentifier() function of the
+ QHelpEngineCore. 'name' and 'id' can be specified at the same time.
+
+ \section3 Files
+
+ \snippet doc_src_qthelp.qdoc 13
+
+ Finally, the actual documentation files have to be listed. Make sure
+ that all files neccessary to display the help are mentioned, i.e.
+ stylesheets or similar files need to be there as well. The files, like all
+ file references in a Qt help project, are relative to the help project file
+ itself. As the example shows, files (but not directories) can also be
+ specified as patterns using wildcards. All listed files will be compressed
+ and written to the Qt compressed help file. So, in the end, one single Qt
+ help file contains all documentation files along with the contents and
+ indices. \note The referenced files must be inside the same directory
+ (or within a subdirectory) as the help project file. An absolute file path
+ is not supported either.
+*/
diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
index 72a8a3cd7..ed75c37ca 100644
--- a/src/assistant/help/help.pro
+++ b/src/assistant/help/help.pro
@@ -4,10 +4,26 @@ QT_PRIVATE = network sql clucene-private
DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT
+QMAKE_DOCS = $$PWD/doc/qthelp.qdocconf
+
load(qt_module)
DEFINES -= QT_ASCII_CAST_WARNINGS
+# impossible to disable exceptions in clucene atm and use help lib without
+CONFIG(exceptions_off) {
+ CONFIG -= exceptions_off
+ CONFIG += exceptions
+ !win32|win32-g++* {
+ QMAKE_CFLAGS -= -fno-exceptions
+ QMAKE_CXXFLAGS -= -fno-exceptions
+ QMAKE_LFLAGS -= -fno-exceptions
+ QMAKE_CFLAGS += -fexceptions
+ QMAKE_CXXFLAGS += -fexceptions
+ QMAKE_LFLAGS += -fexceptions
+ }
+}
+
RESOURCES += helpsystem.qrc
SOURCES += qhelpenginecore.cpp \
qhelpengine.cpp \
diff --git a/src/assistant/help/qclucenefieldnames.cpp b/src/assistant/help/qclucenefieldnames.cpp
index 798200180..3f3e80966 100644
--- a/src/assistant/help/qclucenefieldnames.cpp
+++ b/src/assistant/help/qclucenefieldnames.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qclucenefieldnames_p.h b/src/assistant/help/qclucenefieldnames_p.h
index 7298c1ca2..84640d6c2 100644
--- a/src/assistant/help/qclucenefieldnames_p.h
+++ b/src/assistant/help/qclucenefieldnames_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelp_global.cpp b/src/assistant/help/qhelp_global.cpp
index 3bee8b241..ff972633f 100644
--- a/src/assistant/help/qhelp_global.cpp
+++ b/src/assistant/help/qhelp_global.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelp_global.h b/src/assistant/help/qhelp_global.h
index 79989fee7..409d49b9d 100644
--- a/src/assistant/help/qhelp_global.h
+++ b/src/assistant/help/qhelp_global.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp
index 2e646183b..548f2b8af 100644
--- a/src/assistant/help/qhelpcollectionhandler.cpp
+++ b/src/assistant/help/qhelpcollectionhandler.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpcollectionhandler_p.h b/src/assistant/help/qhelpcollectionhandler_p.h
index 7d9f331b2..744dfa14d 100644
--- a/src/assistant/help/qhelpcollectionhandler_p.h
+++ b/src/assistant/help/qhelpcollectionhandler_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpcontentwidget.cpp b/src/assistant/help/qhelpcontentwidget.cpp
index e25dd0366..cf3838c2b 100644
--- a/src/assistant/help/qhelpcontentwidget.cpp
+++ b/src/assistant/help/qhelpcontentwidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -44,6 +44,7 @@
#include "qhelpengine_p.h"
#include "qhelpdbreader_p.h"
+#include <QDir>
#include <QtCore/QStack>
#include <QtCore/QThread>
#include <QtCore/QMutex>
@@ -530,41 +531,35 @@ QHelpContentWidget::QHelpContentWidget()
*/
QModelIndex QHelpContentWidget::indexOf(const QUrl &link)
{
- QHelpContentModel *contentModel =
- qobject_cast<QHelpContentModel*>(model());
+ QHelpContentModel *contentModel = qobject_cast<QHelpContentModel*>(model());
if (!contentModel || link.scheme() != QLatin1String("qthelp"))
return QModelIndex();
m_syncIndex = QModelIndex();
- for (int i=0; i<contentModel->rowCount(); ++i) {
- QHelpContentItem *itm =
- contentModel->contentItemAt(contentModel->index(i, 0));
+ for (int i = 0; i < contentModel->rowCount(); ++i) {
+ QHelpContentItem *itm = contentModel->contentItemAt(contentModel->index(i, 0));
if (itm && itm->url().host() == link.host()) {
- QString path = link.path();
- if (path.startsWith(QLatin1Char('/')))
- path = path.mid(1);
- if (searchContentItem(contentModel, contentModel->index(i, 0), path)) {
+ if (searchContentItem(contentModel, contentModel->index(i, 0), QDir::cleanPath(link.path())))
return m_syncIndex;
- }
}
}
return QModelIndex();
}
-bool QHelpContentWidget::searchContentItem(QHelpContentModel *model,
- const QModelIndex &parent, const QString &path)
+bool QHelpContentWidget::searchContentItem(QHelpContentModel *model, const QModelIndex &parent,
+ const QString &cleanPath)
{
QHelpContentItem *parentItem = model->contentItemAt(parent);
if (!parentItem)
return false;
- if (parentItem->url().path() == path) {
+ if (QDir::cleanPath(parentItem->url().path()) == cleanPath) {
m_syncIndex = parent;
return true;
}
for (int i=0; i<parentItem->childCount(); ++i) {
- if (searchContentItem(model, model->index(i, 0, parent), path))
+ if (searchContentItem(model, model->index(i, 0, parent), cleanPath))
return true;
}
return false;
diff --git a/src/assistant/help/qhelpcontentwidget.h b/src/assistant/help/qhelpcontentwidget.h
index e8617c223..f10cb35f2 100644
--- a/src/assistant/help/qhelpcontentwidget.h
+++ b/src/assistant/help/qhelpcontentwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpdatainterface.cpp b/src/assistant/help/qhelpdatainterface.cpp
index 140f8d0d0..fa3af6fd6 100644
--- a/src/assistant/help/qhelpdatainterface.cpp
+++ b/src/assistant/help/qhelpdatainterface.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpdatainterface_p.h b/src/assistant/help/qhelpdatainterface_p.h
index a93b9e286..3b4e3ac84 100644
--- a/src/assistant/help/qhelpdatainterface_p.h
+++ b/src/assistant/help/qhelpdatainterface_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpdbreader.cpp b/src/assistant/help/qhelpdbreader.cpp
index e4b496233..415710525 100644
--- a/src/assistant/help/qhelpdbreader.cpp
+++ b/src/assistant/help/qhelpdbreader.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpdbreader_p.h b/src/assistant/help/qhelpdbreader_p.h
index 114d5ab3b..3b8014425 100644
--- a/src/assistant/help/qhelpdbreader_p.h
+++ b/src/assistant/help/qhelpdbreader_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpengine.cpp b/src/assistant/help/qhelpengine.cpp
index 0d30f5062..7e79b2d10 100644
--- a/src/assistant/help/qhelpengine.cpp
+++ b/src/assistant/help/qhelpengine.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpengine.h b/src/assistant/help/qhelpengine.h
index c6cf8fec8..45bdec090 100644
--- a/src/assistant/help/qhelpengine.h
+++ b/src/assistant/help/qhelpengine.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpengine_p.h b/src/assistant/help/qhelpengine_p.h
index a24b5173e..91a298fff 100644
--- a/src/assistant/help/qhelpengine_p.h
+++ b/src/assistant/help/qhelpengine_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -89,7 +89,6 @@ public:
QMap<QString, QHelpDBReader*> fileNameReaderMap;
QMultiMap<QString, QHelpDBReader*> virtualFolderMap;
QStringList orderedFileNameList;
- QHash<QString, QString> nameSpaceVirtualFolderMap;
QHelpCollectionHandler *collectionHandler;
QString currentFilter;
diff --git a/src/assistant/help/qhelpenginecore.cpp b/src/assistant/help/qhelpenginecore.cpp
index 4f05b2e6c..15ce07620 100644
--- a/src/assistant/help/qhelpenginecore.cpp
+++ b/src/assistant/help/qhelpenginecore.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -88,7 +88,6 @@ void QHelpEngineCorePrivate::clearMaps()
fileNameReaderMap.clear();
virtualFolderMap.clear();
orderedFileNameList.clear();
- nameSpaceVirtualFolderMap.clear();
}
bool QHelpEngineCorePrivate::setup()
@@ -129,7 +128,6 @@ bool QHelpEngineCorePrivate::setup()
fileNameReaderMap.insert(absFileName, reader);
virtualFolderMap.insert(info.folderName, reader);
orderedFileNameList.append(absFileName);
- nameSpaceVirtualFolderMap.insert(info.namespaceName, info.folderName);
}
q->currentFilter();
emit q->setupFinished();
diff --git a/src/assistant/help/qhelpenginecore.h b/src/assistant/help/qhelpenginecore.h
index 1123fbd4d..e17ae880c 100644
--- a/src/assistant/help/qhelpenginecore.h
+++ b/src/assistant/help/qhelpenginecore.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpgenerator.cpp b/src/assistant/help/qhelpgenerator.cpp
index 01394b1a3..ac251246a 100644
--- a/src/assistant/help/qhelpgenerator.cpp
+++ b/src/assistant/help/qhelpgenerator.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpgenerator_p.h b/src/assistant/help/qhelpgenerator_p.h
index 698c4ae4a..3c447e898 100644
--- a/src/assistant/help/qhelpgenerator_p.h
+++ b/src/assistant/help/qhelpgenerator_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp
index 515b95df8..c5f26a701 100644
--- a/src/assistant/help/qhelpindexwidget.cpp
+++ b/src/assistant/help/qhelpindexwidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpindexwidget.h b/src/assistant/help/qhelpindexwidget.h
index dc10e77ac..f852f44ed 100644
--- a/src/assistant/help/qhelpindexwidget.h
+++ b/src/assistant/help/qhelpindexwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpprojectdata.cpp b/src/assistant/help/qhelpprojectdata.cpp
index 7d8cdd0cf..ee86f78a5 100644
--- a/src/assistant/help/qhelpprojectdata.cpp
+++ b/src/assistant/help/qhelpprojectdata.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpprojectdata_p.h b/src/assistant/help/qhelpprojectdata_p.h
index c3b6bf0f7..198bac8fc 100644
--- a/src/assistant/help/qhelpprojectdata_p.h
+++ b/src/assistant/help/qhelpprojectdata_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchengine.cpp b/src/assistant/help/qhelpsearchengine.cpp
index 823c1a5ed..acdd306b6 100644
--- a/src/assistant/help/qhelpsearchengine.cpp
+++ b/src/assistant/help/qhelpsearchengine.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchengine.h b/src/assistant/help/qhelpsearchengine.h
index b95ca5fda..5312ff25a 100644
--- a/src/assistant/help/qhelpsearchengine.h
+++ b/src/assistant/help/qhelpsearchengine.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -67,8 +67,8 @@ public:
QHelpSearchQuery()
: fieldName(DEFAULT) { wordList.clear(); }
- QHelpSearchQuery(FieldName field, const QStringList &wordList)
- : fieldName(field), wordList(wordList) {}
+ QHelpSearchQuery(FieldName field, const QStringList &wordList_)
+ : fieldName(field), wordList(wordList_) {}
FieldName fieldName;
QStringList wordList;
diff --git a/src/assistant/help/qhelpsearchindex_default.cpp b/src/assistant/help/qhelpsearchindex_default.cpp
index f24f57fd2..ddf86d69e 100644
--- a/src/assistant/help/qhelpsearchindex_default.cpp
+++ b/src/assistant/help/qhelpsearchindex_default.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchindex_default_p.h b/src/assistant/help/qhelpsearchindex_default_p.h
index 65a132093..a1d55dd03 100644
--- a/src/assistant/help/qhelpsearchindex_default_p.h
+++ b/src/assistant/help/qhelpsearchindex_default_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchindexreader.cpp b/src/assistant/help/qhelpsearchindexreader.cpp
index abc1f1e7d..f434ef2b1 100644
--- a/src/assistant/help/qhelpsearchindexreader.cpp
+++ b/src/assistant/help/qhelpsearchindexreader.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchindexreader_clucene.cpp b/src/assistant/help/qhelpsearchindexreader_clucene.cpp
index b1172f259..4fb48176c 100644
--- a/src/assistant/help/qhelpsearchindexreader_clucene.cpp
+++ b/src/assistant/help/qhelpsearchindexreader_clucene.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -107,9 +107,7 @@ void QHelpSearchIndexReaderClucene::run()
emit searchingStarted();
-#if !defined(QT_NO_EXCEPTIONS)
try {
-#endif
QCLuceneBooleanQuery booleanQueryTitle;
QCLuceneBooleanQuery booleanQueryContent;
QCLuceneStandardAnalyzer analyzer;
@@ -199,15 +197,12 @@ void QHelpSearchIndexReaderClucene::run()
if ((count > 0) && boost)
boostSearchHits(engine, hitList, queryList);
emit searchingFinished(hitList.count());
-
-#if !defined(QT_NO_EXCEPTIONS)
} catch(...) {
mutex.lock();
hitList.clear();
mutex.unlock();
emit searchingFinished(0);
}
-#endif
}
}
@@ -274,7 +269,7 @@ bool QHelpSearchIndexReaderClucene::buildTryHarderQuery(
return false;
if (isNegativeQuery(query))
return false;
- if (!addDefaultQuery(query, fieldName, false, booleanQuery, analyzer))
+ if (!addDefaultQuery(query, fieldName, !filterAttributes.isEmpty(), booleanQuery, analyzer))
return false;
if (filterAttributes.isEmpty())
return true;
diff --git a/src/assistant/help/qhelpsearchindexreader_clucene_p.h b/src/assistant/help/qhelpsearchindexreader_clucene_p.h
index ae0d5d0fa..9ae68aad3 100644
--- a/src/assistant/help/qhelpsearchindexreader_clucene_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_clucene_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchindexreader_default.cpp b/src/assistant/help/qhelpsearchindexreader_default.cpp
index f7298f89e..a08845663 100644
--- a/src/assistant/help/qhelpsearchindexreader_default.cpp
+++ b/src/assistant/help/qhelpsearchindexreader_default.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchindexreader_default_p.h b/src/assistant/help/qhelpsearchindexreader_default_p.h
index 0d48c5d10..f5099a0d0 100644
--- a/src/assistant/help/qhelpsearchindexreader_default_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_default_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchindexreader_p.h b/src/assistant/help/qhelpsearchindexreader_p.h
index 4313c228f..4922df4ec 100644
--- a/src/assistant/help/qhelpsearchindexreader_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchindexwriter_clucene.cpp b/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
index 1c5d13afc..f717aed99 100644
--- a/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
+++ b/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -591,9 +591,7 @@ void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile,
void QHelpSearchIndexWriter::optimizeIndex()
{
-#if !defined(QT_NO_EXCEPTIONS)
try {
-#endif
if (QCLuceneIndexReader::indexExists(m_indexFilesFolder)) {
if (QCLuceneIndexReader::isLocked(m_indexFilesFolder))
return;
@@ -603,19 +601,15 @@ void QHelpSearchIndexWriter::optimizeIndex()
writer.optimize();
writer.close();
}
-#if !defined(QT_NO_EXCEPTIONS)
} catch (...) {
qWarning("Full Text Search, could not optimize index.");
return;
}
-#endif
}
void QHelpSearchIndexWriter::run()
{
-#if !defined(QT_NO_EXCEPTIONS)
try {
-#endif
QMutexLocker mutexLocker(&mutex);
if (m_cancel)
@@ -801,13 +795,9 @@ void QHelpSearchIndexWriter::run()
}
}
}
-
-#if !defined(QT_NO_EXCEPTIONS)
} catch (...) {
qWarning("%s: Failed because of CLucene exception.", Q_FUNC_INFO);
}
-#endif
-
emit indexingFinished();
}
@@ -824,16 +814,12 @@ bool QHelpSearchIndexWriter::addDocuments(const QList<QUrl> docFiles,
QCLuceneDocument document;
DocumentHelper helper(url.toString(), engine.fileData(url));
if (helper.addFieldsToDocument(&document, namespaceName, attrList)) {
-#if !defined(QT_NO_EXCEPTIONS)
try {
-#endif
writer->addDocument(document, analyzer);
-#if !defined(QT_NO_EXCEPTIONS)
} catch (...) {
qWarning("Full Text Search, could not properly add documents.");
return false;
}
-#endif
}
locker.relock();
if (m_cancel)
@@ -880,16 +866,12 @@ QList<QUrl> QHelpSearchIndexWriter::indexableFiles(QHelpEngineCore *helpEngine,
void QHelpSearchIndexWriter::closeIndexWriter(QCLuceneIndexWriter *writer)
{
-#if !defined(QT_NO_EXCEPTIONS)
try {
-#endif
writer->close();
delete writer;
-#if !defined(QT_NO_EXCEPTIONS)
} catch (...) {
qWarning("Full Text Search, could not properly close index writer.");
}
-#endif
}
} // namespace clucene
diff --git a/src/assistant/help/qhelpsearchindexwriter_clucene_p.h b/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
index f94905eb0..7253119be 100644
--- a/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
+++ b/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchindexwriter_default.cpp b/src/assistant/help/qhelpsearchindexwriter_default.cpp
index 47f6aa32a..ebfae3fc9 100644
--- a/src/assistant/help/qhelpsearchindexwriter_default.cpp
+++ b/src/assistant/help/qhelpsearchindexwriter_default.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchindexwriter_default_p.h b/src/assistant/help/qhelpsearchindexwriter_default_p.h
index 8d1e22545..67e1e416e 100644
--- a/src/assistant/help/qhelpsearchindexwriter_default_p.h
+++ b/src/assistant/help/qhelpsearchindexwriter_default_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index cead9e5d3..d2e5da082 100644
--- a/src/assistant/help/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -136,6 +136,35 @@ private:
#endif
}
+ QList<QHelpSearchQuery> escapeQueries(const QList<QHelpSearchQuery> &queries)
+ {
+ static QStringList charsToEscapeList;
+ if (charsToEscapeList.isEmpty()) {
+ charsToEscapeList << QLatin1String("\\") << QLatin1String("+") << QLatin1String("-")
+ << QLatin1String("!") << QLatin1String("(") << QLatin1String(")") << QLatin1String(":")
+ << QLatin1String("^") << QLatin1String("[") << QLatin1String("]") << QLatin1String("{")
+ << QLatin1String("}") << QLatin1String("~");
+ }
+
+ static QString escapeChar(QLatin1String("\\"));
+ static QRegExp regExp(QLatin1String("[\\+\\-\\!\\(\\)\\^\\[\\]\\{\\}~:]"));
+
+ QList<QHelpSearchQuery> escapedQueries;
+ foreach (const QHelpSearchQuery &query, queries) {
+ QHelpSearchQuery escapedQuery;
+ escapedQuery.fieldName = query.fieldName;
+ foreach (QString word, query.wordList) {
+ if (word.contains(regExp)) {
+ foreach (const QString &charToEscape, charsToEscapeList)
+ word.replace(charToEscape, escapeChar + charToEscape);
+ }
+ escapedQuery.wordList.append(word);
+ }
+ escapedQueries.append(escapedQuery);
+ }
+ return escapedQueries;
+ }
+
QStringList buildTermList(const QString query)
{
bool s = false;
@@ -279,7 +308,6 @@ private slots:
#if !defined(QT_CLUCENE_SUPPORT)
queryList.append(QHelpSearchQuery(QHelpSearchQuery::DEFAULT,
QStringList(defaultQuery->text())));
-
#else
if (defaultQuery->isEnabled()) {
queryList.append(QHelpSearchQuery(QHelpSearchQuery::DEFAULT,
@@ -393,7 +421,7 @@ private:
\fn void QHelpSearchQueryWidget::search()
This signal is emitted when a the user has the search button invoked.
- After reciving the signal you can ask the QHelpSearchQueryWidget for the
+ After receiving the signal you can ask the QHelpSearchQueryWidget for the
build list of QHelpSearchQuery's that you may pass to the QHelpSearchEngine's
search() function.
*/
@@ -538,8 +566,9 @@ QList<QHelpSearchQuery> QHelpSearchQueryWidget::query() const
{
const QHelpSearchQueryWidgetPrivate::QueryHistory &queryHist =
d->simpleSearch ? d->simpleQueries : d->complexQueries;
- return queryHist.queries.isEmpty() ?
- QList<QHelpSearchQuery>() : queryHist.queries.last();
+ if (queryHist.queries.isEmpty())
+ return QList<QHelpSearchQuery>();
+ return d->escapeQueries(queryHist.queries.last());
}
/*!
@@ -575,7 +604,8 @@ void QHelpSearchQueryWidget::focusInEvent(QFocusEvent *focusEvent)
}
}
-/*! \reimp
+/*!
+ \reimp
*/
void QHelpSearchQueryWidget::changeEvent(QEvent *event)
{
diff --git a/src/assistant/help/qhelpsearchquerywidget.h b/src/assistant/help/qhelpsearchquerywidget.h
index f313fdf1a..b55961c23 100644
--- a/src/assistant/help/qhelpsearchquerywidget.h
+++ b/src/assistant/help/qhelpsearchquerywidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchresultwidget.cpp b/src/assistant/help/qhelpsearchresultwidget.cpp
index 9a5f24415..d038d9852 100644
--- a/src/assistant/help/qhelpsearchresultwidget.cpp
+++ b/src/assistant/help/qhelpsearchresultwidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/help/qhelpsearchresultwidget.h b/src/assistant/help/qhelpsearchresultwidget.h
index a054f169d..a8af7f04d 100644
--- a/src/assistant/help/qhelpsearchresultwidget.h
+++ b/src/assistant/help/qhelpsearchresultwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qcollectiongenerator/main.cpp b/src/assistant/qcollectiongenerator/main.cpp
index 38eda822d..57857e5f9 100644
--- a/src/assistant/qcollectiongenerator/main.cpp
+++ b/src/assistant/qcollectiongenerator/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/adpreader.cpp b/src/assistant/qhelpconverter/adpreader.cpp
index 3984afec7..6a86b97f7 100644
--- a/src/assistant/qhelpconverter/adpreader.cpp
+++ b/src/assistant/qhelpconverter/adpreader.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/adpreader.h b/src/assistant/qhelpconverter/adpreader.h
index 35bf0fcb8..d5564068f 100644
--- a/src/assistant/qhelpconverter/adpreader.h
+++ b/src/assistant/qhelpconverter/adpreader.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/conversionwizard.cpp b/src/assistant/qhelpconverter/conversionwizard.cpp
index ae60af66b..62a45948a 100644
--- a/src/assistant/qhelpconverter/conversionwizard.cpp
+++ b/src/assistant/qhelpconverter/conversionwizard.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/conversionwizard.h b/src/assistant/qhelpconverter/conversionwizard.h
index 8d1bd7450..0fe30e2be 100644
--- a/src/assistant/qhelpconverter/conversionwizard.h
+++ b/src/assistant/qhelpconverter/conversionwizard.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/filespage.cpp b/src/assistant/qhelpconverter/filespage.cpp
index f195e1386..62520754d 100644
--- a/src/assistant/qhelpconverter/filespage.cpp
+++ b/src/assistant/qhelpconverter/filespage.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/filespage.h b/src/assistant/qhelpconverter/filespage.h
index 7b5d463e9..09adfa90d 100644
--- a/src/assistant/qhelpconverter/filespage.h
+++ b/src/assistant/qhelpconverter/filespage.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/filterpage.cpp b/src/assistant/qhelpconverter/filterpage.cpp
index 0af53c415..dd4ef66f0 100644
--- a/src/assistant/qhelpconverter/filterpage.cpp
+++ b/src/assistant/qhelpconverter/filterpage.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/filterpage.h b/src/assistant/qhelpconverter/filterpage.h
index f6072dff4..db9a5c561 100644
--- a/src/assistant/qhelpconverter/filterpage.h
+++ b/src/assistant/qhelpconverter/filterpage.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/finishpage.cpp b/src/assistant/qhelpconverter/finishpage.cpp
index 97bc6823e..f43bcdbaa 100644
--- a/src/assistant/qhelpconverter/finishpage.cpp
+++ b/src/assistant/qhelpconverter/finishpage.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/finishpage.h b/src/assistant/qhelpconverter/finishpage.h
index cf936b99c..810b4702a 100644
--- a/src/assistant/qhelpconverter/finishpage.h
+++ b/src/assistant/qhelpconverter/finishpage.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/generalpage.cpp b/src/assistant/qhelpconverter/generalpage.cpp
index 6b7c33caa..50d3569d6 100644
--- a/src/assistant/qhelpconverter/generalpage.cpp
+++ b/src/assistant/qhelpconverter/generalpage.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/generalpage.h b/src/assistant/qhelpconverter/generalpage.h
index 32c3966a4..95d1e848b 100644
--- a/src/assistant/qhelpconverter/generalpage.h
+++ b/src/assistant/qhelpconverter/generalpage.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/helpwindow.cpp b/src/assistant/qhelpconverter/helpwindow.cpp
index 414029d81..43ae46c05 100644
--- a/src/assistant/qhelpconverter/helpwindow.cpp
+++ b/src/assistant/qhelpconverter/helpwindow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/helpwindow.h b/src/assistant/qhelpconverter/helpwindow.h
index ac1cdb274..2dd822935 100644
--- a/src/assistant/qhelpconverter/helpwindow.h
+++ b/src/assistant/qhelpconverter/helpwindow.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/identifierpage.cpp b/src/assistant/qhelpconverter/identifierpage.cpp
index 25f82ce2b..82ff597ea 100644
--- a/src/assistant/qhelpconverter/identifierpage.cpp
+++ b/src/assistant/qhelpconverter/identifierpage.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/identifierpage.h b/src/assistant/qhelpconverter/identifierpage.h
index 3210cb891..ae8daa012 100644
--- a/src/assistant/qhelpconverter/identifierpage.h
+++ b/src/assistant/qhelpconverter/identifierpage.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/inputpage.cpp b/src/assistant/qhelpconverter/inputpage.cpp
index adef87d7f..0ea66f17a 100644
--- a/src/assistant/qhelpconverter/inputpage.cpp
+++ b/src/assistant/qhelpconverter/inputpage.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/inputpage.h b/src/assistant/qhelpconverter/inputpage.h
index dc2721aa6..5ea1bfb7e 100644
--- a/src/assistant/qhelpconverter/inputpage.h
+++ b/src/assistant/qhelpconverter/inputpage.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/main.cpp b/src/assistant/qhelpconverter/main.cpp
index 8f304c754..8ca718908 100644
--- a/src/assistant/qhelpconverter/main.cpp
+++ b/src/assistant/qhelpconverter/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/outputpage.cpp b/src/assistant/qhelpconverter/outputpage.cpp
index b9e8e2283..ba52e1236 100644
--- a/src/assistant/qhelpconverter/outputpage.cpp
+++ b/src/assistant/qhelpconverter/outputpage.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/outputpage.h b/src/assistant/qhelpconverter/outputpage.h
index 886754fe3..81e871a6d 100644
--- a/src/assistant/qhelpconverter/outputpage.h
+++ b/src/assistant/qhelpconverter/outputpage.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/pathpage.cpp b/src/assistant/qhelpconverter/pathpage.cpp
index 14cd75f38..bd5c6742c 100644
--- a/src/assistant/qhelpconverter/pathpage.cpp
+++ b/src/assistant/qhelpconverter/pathpage.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/pathpage.h b/src/assistant/qhelpconverter/pathpage.h
index 2e0185710..9f51344ce 100644
--- a/src/assistant/qhelpconverter/pathpage.h
+++ b/src/assistant/qhelpconverter/pathpage.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/qhcpwriter.cpp b/src/assistant/qhelpconverter/qhcpwriter.cpp
index 5819500a0..653697bcc 100644
--- a/src/assistant/qhelpconverter/qhcpwriter.cpp
+++ b/src/assistant/qhelpconverter/qhcpwriter.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/qhcpwriter.h b/src/assistant/qhelpconverter/qhcpwriter.h
index bd95e5b4b..4cc6f082d 100644
--- a/src/assistant/qhelpconverter/qhcpwriter.h
+++ b/src/assistant/qhelpconverter/qhcpwriter.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/qhelpconverter.pro b/src/assistant/qhelpconverter/qhelpconverter.pro
index 33c2529ba..8c8adfe24 100644
--- a/src/assistant/qhelpconverter/qhelpconverter.pro
+++ b/src/assistant/qhelpconverter/qhelpconverter.pro
@@ -2,7 +2,6 @@ QT += help widgets
TEMPLATE = app
TARGET = qhelpconverter
DESTDIR = $$QT.help.bins
-CONFIG += qt warn_on
!build_pass:contains(QT_CONFIG, build_all): CONFIG += release
target.path=$$[QT_INSTALL_BINS]
diff --git a/src/assistant/qhelpconverter/qhpwriter.cpp b/src/assistant/qhelpconverter/qhpwriter.cpp
index 5b06f38bc..f1cd14b30 100644
--- a/src/assistant/qhelpconverter/qhpwriter.cpp
+++ b/src/assistant/qhelpconverter/qhpwriter.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpconverter/qhpwriter.h b/src/assistant/qhelpconverter/qhpwriter.h
index adecba683..f751099e5 100644
--- a/src/assistant/qhelpconverter/qhpwriter.h
+++ b/src/assistant/qhelpconverter/qhpwriter.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpgenerator/main.cpp b/src/assistant/qhelpgenerator/main.cpp
index 121af387f..6e948c860 100644
--- a/src/assistant/qhelpgenerator/main.cpp
+++ b/src/assistant/qhelpgenerator/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro
index a3f7913b9..2531203b5 100644
--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
@@ -1,5 +1,7 @@
QT += network help-private
+CONFIG += qpa_minimal_plugin
+
SOURCES += ../shared/helpgenerator.cpp \
main.cpp
diff --git a/src/assistant/shared/collectionconfiguration.cpp b/src/assistant/shared/collectionconfiguration.cpp
index 9fb48d076..f09fdb5ec 100644
--- a/src/assistant/shared/collectionconfiguration.cpp
+++ b/src/assistant/shared/collectionconfiguration.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/shared/collectionconfiguration.h b/src/assistant/shared/collectionconfiguration.h
index 1c950a610..f432612d8 100644
--- a/src/assistant/shared/collectionconfiguration.h
+++ b/src/assistant/shared/collectionconfiguration.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/shared/helpgenerator.cpp b/src/assistant/shared/helpgenerator.cpp
index 426068cec..3181572ee 100644
--- a/src/assistant/shared/helpgenerator.cpp
+++ b/src/assistant/shared/helpgenerator.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt Assistant of the Qt Toolkit.
diff --git a/src/assistant/shared/helpgenerator.h b/src/assistant/shared/helpgenerator.h
index 7c4b375c0..b6d1091f9 100644
--- a/src/assistant/shared/helpgenerator.h
+++ b/src/assistant/shared/helpgenerator.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt Assistant of the Qt Toolkit.