Changeset 651 for trunk/tools/assistant


Ignore:
Timestamp:
Mar 8, 2010, 12:52:58 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.2 sources.

Location:
trunk
Files:
168 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/assistant/compat/config.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/config.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/docuparser.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/docuparser.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/fontsettingsdialog.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/fontsettingsdialog.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/helpdialog.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/helpdialog.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/helpdialog.ui

    r561 r651  
    33 <comment>*********************************************************************
    44**
    5 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     5** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    66** All rights reserved.
    77** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/helpwindow.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/helpwindow.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/index.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/index.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/lib/qassistantclient.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/lib/qassistantclient.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/lib/qassistantclient_global.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/mainwindow.cpp

    r631 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    326326                                    "<h3>%1</h3>"
    327327                                    "<p>Version %2</p></center>"
    328                                     "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>")
     328                                    "<p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p>")
    329329                   .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)));
    330330    box.setWindowTitle(tr("Qt Assistant"));

  • trunk/tools/assistant/compat/mainwindow.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/mainwindow.ui

    r561 r651  
    22 <comment>*********************************************************************
    33**
    4 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/profile.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/profile.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/tabbedbrowser.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/tabbedbrowser.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/tabbedbrowser.ui

    r561 r651  
    33 <comment>*********************************************************************
    44**
    5 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     5** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    66** All rights reserved.
    77** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/topicchooser.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/topicchooser.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/compat/topicchooser.ui

    r561 r651  
    22 <comment>*********************************************************************
    33**
    4 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/fulltextsearch/qanalyzer.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qanalyzer_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qclucene-config_p.h

    r633 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qclucene_global_p.h

    r632 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qdocument.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qdocument_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qfield.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qfield_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qfilter.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qfilter_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qhits.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qhits_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qindexreader.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qindexreader_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qindexwriter.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qindexwriter_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qquery.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qquery_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qqueryparser.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qqueryparser_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qreader.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qreader_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qsearchable.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qsearchable_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qsort.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qsort_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qterm.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qterm_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qtoken.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qtoken_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qtokenizer.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qtokenizer_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qtokenstream.cpp

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/fulltextsearch/qtokenstream_p.h

    r561 r651  
    44** All rights reserved.
    55**
    6 ** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     6** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    77** All rights reserved.
    88**

  • trunk/tools/assistant/lib/qhelp_global.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelp_global.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpcollectionhandler.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpcollectionhandler_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpcontentwidget.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpcontentwidget.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpdatainterface.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpdatainterface_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpdbreader.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpdbreader_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpengine.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpengine.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpengine_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpenginecore.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpenginecore.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpgenerator.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpgenerator_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpindexwidget.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpindexwidget.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpprojectdata.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpprojectdata_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchengine.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchengine.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindex_default.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindex_default_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexreader.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexreader_default.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexreader_default_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexreader_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexwriter_default.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchindexwriter_default_p.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/lib/qhelpsearchquerywidget.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    119119    {
    120120        // nothing todo
     121    }
     122
     123    void retranslate()
     124    {
     125        simpleSearchLabel->setText(QHelpSearchQueryWidget::tr("Search for:"));
     126        prevQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Previous search"));
     127        nextQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Next search"));
     128        searchButton->setText(QHelpSearchQueryWidget::tr("Search"));
     129#ifdef QT_CLUCENE_SUPPORT
     130        advancedSearchLabel->setText(QHelpSearchQueryWidget::tr("Advanced search"));
     131        similarLabel->setText(QHelpSearchQueryWidget::tr("words <B>similar</B> to:"));
     132        withoutLabel->setText(QHelpSearchQueryWidget::tr("<B>without</B> the words:"));
     133        exactLabel->setText(QHelpSearchQueryWidget::tr("with <B>exact phrase</B>:"));
     134        allLabel->setText(QHelpSearchQueryWidget::tr("with <B>all</B> of the words:"));
     135        atLeastLabel->setText(QHelpSearchQueryWidget::tr("with <B>at least one</B> of the words:"));
     136#endif
    121137    }
    122138
    … …  
    361377
    362378    bool simpleSearch;
     379    QLabel *simpleSearchLabel;
     380    QLabel *advancedSearchLabel;
     381    QLabel *similarLabel;
     382    QLabel *withoutLabel;
     383    QLabel *exactLabel;
     384    QLabel *allLabel;
     385    QLabel *atLeastLabel;
    363386    QPushButton *searchButton;
    364387    QWidget* advancedSearchWidget;
    … …  
    409432
    410433    QHBoxLayout* hBoxLayout = new QHBoxLayout();
    411     QLabel *label = new QLabel(tr("Search for:"), this);
     434    d->simpleSearchLabel = new QLabel(this);
    412435    d->defaultQuery = new QLineEdit(this);
    413436    d->defaultQuery->setCompleter(&d->searchCompleter);
    414437    d->prevQueryButton = new QToolButton(this);
    415438    d->prevQueryButton->setArrowType(Qt::LeftArrow);
    416     d->prevQueryButton->setToolTip(tr("Previous search"));
    417439    d->prevQueryButton->setEnabled(false);
    418440    d->nextQueryButton = new QToolButton(this);
    419441    d->nextQueryButton->setArrowType(Qt::RightArrow);
    420     d->nextQueryButton->setToolTip(tr("Next search"));
    421442    d->nextQueryButton->setEnabled(false);
    422     d->searchButton = new QPushButton(tr("Search"), this);
    423     hBoxLayout->addWidget(label);
     443    d->searchButton = new QPushButton(this);
     444    hBoxLayout->addWidget(d->simpleSearchLabel);
    424445    hBoxLayout->addWidget(d->defaultQuery);
    425446    hBoxLayout->addWidget(d->prevQueryButton);
    … …  
    440461    d->showHideAdvancedSearchButton->setMinimumSize(25, 20);
    441462
    442     label = new QLabel(tr("Advanced search"), this);
     463    d->advancedSearchLabel = new QLabel(this);
    443464    QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
    444     sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
    445     label->setSizePolicy(sizePolicy);
     465    sizePolicy.setHeightForWidth(d->advancedSearchLabel->sizePolicy().hasHeightForWidth());
     466    d->advancedSearchLabel->setSizePolicy(sizePolicy);
    446467
    447468    QFrame* hLine = new QFrame(this);
    448469    hLine->setFrameStyle(QFrame::HLine);
    449470    hBoxLayout->addWidget(d->showHideAdvancedSearchButton);
    450     hBoxLayout->addWidget(label);
     471    hBoxLayout->addWidget(d->advancedSearchLabel);
    451472    hBoxLayout->addWidget(hLine);
    452473
    … …  
    458479    gLayout->setMargin(0);
    459480
    460     label = new QLabel(tr("words <B>similar</B> to:"), this);
    461     gLayout->addWidget(label, 0, 0);
     481    d->similarLabel = new QLabel(this);
     482    gLayout->addWidget(d->similarLabel, 0, 0);
    462483    d->similarQuery = new QLineEdit(this);
    463484    d->similarQuery->setCompleter(&d->searchCompleter);
    464485    gLayout->addWidget(d->similarQuery, 0, 1);
    465486
    466     label = new QLabel(tr("<B>without</B> the words:"), this);
    467     gLayout->addWidget(label, 1, 0);
     487    d->withoutLabel = new QLabel(this);
     488    gLayout->addWidget(d->withoutLabel, 1, 0);
    468489    d->withoutQuery = new QLineEdit(this);
    469490    d->withoutQuery->setCompleter(&d->searchCompleter);
    470491    gLayout->addWidget(d->withoutQuery, 1, 1);
    471492
    472     label = new QLabel(tr("with <B>exact phrase</B>:"), this);
    473     gLayout->addWidget(label, 2, 0);
     493    d->exactLabel = new QLabel(this);
     494    gLayout->addWidget(d->exactLabel, 2, 0);
    474495    d->exactQuery = new QLineEdit(this);
    475496    d->exactQuery->setCompleter(&d->searchCompleter);
    476497    gLayout->addWidget(d->exactQuery, 2, 1);
    477498
    478     label = new QLabel(tr("with <B>all</B> of the words:"), this);
    479     gLayout->addWidget(label, 3, 0);
     499    d->allLabel = new QLabel(this);
     500    gLayout->addWidget(d->allLabel, 3, 0);
    480501    d->allQuery = new QLineEdit(this);
    481502    d->allQuery->setCompleter(&d->searchCompleter);
    482503    gLayout->addWidget(d->allQuery, 3, 1);
    483504
    484     label = new QLabel(tr("with <B>at least one</B> of the words:"), this);
    485     gLayout->addWidget(label, 4, 0);
     505    d->atLeastLabel = new QLabel(this);
     506    gLayout->addWidget(d->atLeastLabel, 4, 0);
    486507    d->atLeastQuery = new QLineEdit(this);
    487508    d->atLeastQuery->setCompleter(&d->searchCompleter);
    … …  
    490511    vLayout->addWidget(d->advancedSearchWidget);
    491512    d->advancedSearchWidget->hide();
     513
     514    d->retranslate();
    492515
    493516    connect(d->exactQuery, SIGNAL(returnPressed()), this, SIGNAL(search()));
    … …  
    532555}
    533556
     557/*! \reimp
     558*/
     559void QHelpSearchQueryWidget::changeEvent(QEvent *event)
     560{
     561    if (event->type() == QEvent::LanguageChange)
     562        d->retranslate();
     563    else
     564        QWidget::changeEvent(event);
     565}
     566
    534567QT_END_NAMESPACE

  • trunk/tools/assistant/lib/qhelpsearchquerywidget.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    7575
    7676private:
    77     void focusInEvent(QFocusEvent *focusEvent);
     77    virtual void focusInEvent(QFocusEvent *focusEvent);
     78    virtual void changeEvent(QEvent *event);
    7879
    7980private:

  • trunk/tools/assistant/lib/qhelpsearchresultwidget.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    409409}
    410410
     411/*! \reimp
     412*/
     413void QHelpSearchResultWidget::changeEvent(QEvent *event)
     414{
     415    if (event->type() == QEvent::LanguageChange)
     416        d->setResults(d->searchEngine->hitCount());
     417}
     418
    411419/*!
    412420    Destroys the search result widget.

  • trunk/tools/assistant/lib/qhelpsearchresultwidget.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    7676    QHelpSearchResultWidgetPrivate *d;
    7777    QHelpSearchResultWidget(QHelpSearchEngine *engine);
     78    virtual void changeEvent(QEvent *event);
    7879};
    7980

  • trunk/tools/assistant/tools/assistant/aboutdialog.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/aboutdialog.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/assistant.rc

    r561 r651  
    1919            VALUE "FileDescription", "Qt Assistant"
    2020            VALUE "FileVersion", "1.0.0.0"
    21             VALUE "LegalCopyright", "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
     21            VALUE "LegalCopyright", "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
    2222            VALUE "InternalName", "assistant.exe"
    2323            VALUE "OriginalFilename", "assistant.exe"

  • trunk/tools/assistant/tools/assistant/bookmarkmanager.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/bookmarkmanager.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/centralwidget.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    359359void CentralWidget::findNext()
    360360{
    361     find(findWidget->editFind->text(), true, false);
     361    find(findWidget->editFind->text(), true);
    362362}
    363363
    … …  
    390390void CentralWidget::findPrevious()
    391391{
    392     find(findWidget->editFind->text(), false, true);
     392    find(findWidget->editFind->text(), false);
    393393}
    394394
    … …  
    698698void CentralWidget::findCurrentText(const QString &text)
    699699{
    700     find(text, false, false);
     700    find(text, true);
    701701}
    702702
    … …  
    897897}
    898898
    899 void CentralWidget::find(const QString &ttf, bool forward, bool backward)
     899void CentralWidget::find(const QString &ttf, bool forward)
    900900{
    901901    QPalette p = findWidget->editFind->palette();
    902902    p.setColor(QPalette::Active, QPalette::Base, Qt::white);
    903903
    904     if (!ttf.isEmpty()) {
    905         HelpViewer *viewer = currentHelpViewer();
    906 
     904    bool found = false;
     905
     906#if defined(QT_NO_WEBKIT)
     907    found = findInTextBrowser(ttf, forward);
     908#else
     909    found = findInWebPage(ttf, forward);
     910#endif
     911
     912    if (!found && !ttf.isEmpty())
     913        p.setColor(QPalette::Active, QPalette::Base, QColor(255, 102, 102));
     914
     915    if (!findWidget->isVisible())
     916        findWidget->show();
     917    findWidget->editFind->setPalette(p);
     918}
     919
     920bool CentralWidget::findInWebPage(const QString &ttf, bool forward)
     921{
     922#if !defined(QT_NO_WEBKIT)
     923    if (HelpViewer *viewer = currentHelpViewer()) {
    907924        bool found = false;
    908 #if !defined(QT_NO_WEBKIT)
    909         if (viewer) {
    910             QWebPage::FindFlags options;
    911             if (backward)
     925        QWebPage::FindFlags options;
     926        if (!ttf.isEmpty()) {
     927            if (!forward)
    912928                options |= QWebPage::FindBackward;
    913929
    … …  
    924940                    findWidget->labelWrapped->show();
    925941            }
    926         } else if (tabWidget->currentWidget() == m_searchWidget) {
    927             QTextBrowser *browser = qFindChild<QTextBrowser*>(m_searchWidget);
    928             found = findInTextBrowser(browser, ttf, forward, backward);
    929942        }
    930 #else
    931         QTextBrowser *browser = qobject_cast<QTextBrowser*>(viewer);
    932         if (tabWidget->currentWidget() == m_searchWidget)
    933             browser = qFindChild<QTextBrowser*>(m_searchWidget);
    934         found = findInTextBrowser(browser, ttf, forward, backward);
    935 #endif
    936 
    937         if (!found)
    938             p.setColor(QPalette::Active, QPalette::Base, QColor(255, 102, 102));
    939     }
    940 
    941     if (!findWidget->isVisible())
    942         findWidget->show();
    943     findWidget->editFind->setPalette(p);
    944 }
    945 
    946 bool CentralWidget::findInTextBrowser(QTextBrowser* browser, const QString &ttf,
    947     bool forward, bool backward)
    948 {
    949     if (!browser)
     943        // force highlighting of all other matches, also when empty (clear)
     944        options = QWebPage::HighlightAllOccurrences;
     945        viewer->findText(QLatin1String(""), options);
     946        viewer->findText(ttf, options);
     947        return found;
     948    }
     949
     950    // this needs to stay, case for active search results page
     951    return findInTextBrowser(ttf, forward);
     952#endif
     953    return false;
     954}
     955
     956bool CentralWidget::findInTextBrowser(const QString &ttf, bool forward)
     957{
     958    QTextBrowser *browser = qobject_cast<QTextBrowser*>(currentHelpViewer());
     959    if (tabWidget->currentWidget() == m_searchWidget)
     960        browser = qFindChild<QTextBrowser*>(m_searchWidget);
     961
     962    if (!browser || ttf.isEmpty())
    950963        return false;
    951964
    … …  
    963976    }
    964977
    965     if (backward)
     978    if (!forward)
    966979        options |= QTextDocument::FindBackward;
    967980
    … …  
    10031016    int i = searchAttached ? 1 : 0;
    10041017    getBrowserFontFor(tabWidget->widget(i), &font);
    1005     for (i; i < tabWidget->count(); ++i)
     1018    for ( ; i < tabWidget->count(); ++i)
    10061019        setBrowserFontFor(tabWidget->widget(i), font);
    10071020}
    … …  
    10751088{
    10761089    setSource(url);
     1090#if defined(QT_NO_WEBKIT)
    10771091    highlightSearchTerms();
     1092#else
     1093    connect(currentHelpViewer(), SIGNAL(loadFinished(bool)), this,
     1094        SLOT(highlightSearchTerms()));
     1095#endif
    10781096}
    10791097
    … …  
    10821100{
    10831101    setSourceInNewTab(url);
     1102#if defined(QT_NO_WEBKIT)
    10841103    highlightSearchTerms();
     1104#else
     1105    connect(currentHelpViewer(), SIGNAL(loadFinished(bool)), this,
     1106        SLOT(highlightSearchTerms()));
     1107#endif
    10851108}
    10861109
    … …  
    10881111CentralWidget::highlightSearchTerms()
    10891112{
    1090 #if defined(QT_NO_WEBKIT)
    10911113    HelpViewer *viewer = currentHelpViewer();
    10921114    if (!viewer)
    … …  
    11101132    }
    11111133
     1134#if defined(QT_NO_WEBKIT)
    11121135    viewer->viewport()->setUpdatesEnabled(false);
    11131136
    … …  
    11411164
    11421165    viewer->viewport()->setUpdatesEnabled(true);
     1166#else
     1167    viewer->findText("", QWebPage::HighlightAllOccurrences);
     1168         // clears existing selections
     1169    foreach (const QString& term, terms)
     1170        viewer->findText(term, QWebPage::HighlightAllOccurrences);
     1171
     1172    disconnect(viewer, SIGNAL(loadFinished(bool)), this,
     1173        SLOT(highlightSearchTerms()));
    11431174#endif
    11441175}

  • trunk/tools/assistant/tools/assistant/centralwidget.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    183183    void setSourceFromSearch(const QUrl &url);
    184184    void setSourceFromSearchInNewTab(const QUrl &url);
     185    void highlightSearchTerms();
    185186
    186187private:
    187188    void connectSignals();
    188189    bool eventFilter(QObject *object, QEvent *e);
    189     void find(const QString &ttf, bool forward, bool backward);
    190     bool findInTextBrowser(QTextBrowser* browser, const QString &ttf,
    191         bool forward, bool backward);
     190    void find(const QString &ttf, bool forward);
     191    bool findInWebPage(const QString &ttf, bool forward);
     192    bool findInTextBrowser(const QString &ttf, bool forward);
    192193    void initPrinter();
    193194    QString quoteTabTitle(const QString &title) const;
    194     void highlightSearchTerms();
    195195    void setLastShownPages();
    196196

  • trunk/tools/assistant/tools/assistant/cmdlineparser.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/cmdlineparser.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/contentwindow.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/contentwindow.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/doc/assistant.qdoc

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/doc/assistant.qdocconf

    r561 r651  
    1111HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
    1212              "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
    13               "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
     13              "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
    1414              "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
    15               "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.1</div></td>\n" \
     15              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.2</div></td>\n" \
    1616              "</tr></table></div></address>"

  • trunk/tools/assistant/tools/assistant/filternamedialog.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/filternamedialog.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/helpviewer.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    142142        || mimeType.endsWith(QLatin1String(".svgz"))) {
    143143            mimeType = QLatin1String("image/svg+xml");
    144     }
    145     else if (mimeType.endsWith(QLatin1String(".css"))) {
     144    } else if (mimeType.endsWith(QLatin1String(".css"))) {
    146145        mimeType = QLatin1String("text/css");
    147     }
    148     else if (mimeType.endsWith(QLatin1String(".js"))) {
     146    } else if (mimeType.endsWith(QLatin1String(".js"))) {
    149147        mimeType = QLatin1String("text/javascript");
     148    } else if (mimeType.endsWith(QLatin1String(".txt"))) {
     149        mimeType = QLatin1String("text/plain");
    150150    } else {
    151151        mimeType = QLatin1String("text/html");
    152152    }
    153153
    154     return new HelpNetworkReply(request, helpEngine->fileData(url), mimeType);
     154    const QByteArray &ba = helpEngine->fileData(url);
     155    return new HelpNetworkReply(request, ba.isEmpty() ? " " : ba, mimeType);
    155156}
    156157

  • trunk/tools/assistant/tools/assistant/helpviewer.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/indexwindow.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/indexwindow.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/installdialog.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/installdialog.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/mainwindow.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    851851            "<h3>%1</h3>"
    852852            "<p>Version %2</p></center>"
    853             "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>")
     853            "<p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p>")
    854854            .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)),
    855855            resources);

  • trunk/tools/assistant/tools/assistant/mainwindow.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/preferencesdialog.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/preferencesdialog.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/qtdocinstaller.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/qtdocinstaller.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/remotecontrol.cpp

    r647 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/remotecontrol.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/remotecontrol_win.h

    r647 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/searchwidget.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/searchwidget.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/topicchooser.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/assistant/topicchooser.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qcollectiongenerator/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/adpreader.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/adpreader.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/conversionwizard.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/conversionwizard.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/filespage.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/filespage.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/filterpage.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/filterpage.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/finishpage.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/finishpage.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/generalpage.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/generalpage.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/helpwindow.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/helpwindow.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/identifierpage.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/identifierpage.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/inputpage.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/inputpage.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/outputpage.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/outputpage.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/pathpage.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/pathpage.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/qhcpwriter.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/qhpwriter.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpconverter/qhpwriter.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/qhelpgenerator/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/shared/helpgenerator.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/assistant/tools/shared/helpgenerator.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
Note: See TracChangeset for help on using the changeset viewer.